From 754a625711b7f2ceafe5f9661f7d94190ee983e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Mon, 9 Sep 2024 14:54:39 +0800 Subject: [PATCH] =?UTF-8?q?feature:=E6=97=B6=E7=A9=BA=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E5=A4=9A=E6=98=8E=E7=BB=86=E8=A1=8C=E5=BC=80=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bespoke/service/impl/SkOrderServiceImpl.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/SkOrderServiceImpl.java b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/SkOrderServiceImpl.java index a202226..d62cd6d 100644 --- a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/SkOrderServiceImpl.java +++ b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/SkOrderServiceImpl.java @@ -180,8 +180,14 @@ public class SkOrderServiceImpl implements OrderService { try { if (locked){ List skOrderItemInfoList = skOrderItemInfoMapper.queryOrderItemInfo(skOrderInfo.getId()); + boolean fpresent = skOrderItemInfoList.stream().filter(item -> DecimalCalculateUtil.stringLessZero(item.getHsje())).findFirst().isPresent(); + boolean zpresent = skOrderItemInfoList.stream().filter(item -> DecimalCalculateUtil.stringMoreZero(item.getHsje())).findFirst().isPresent(); + if (fpresent && zpresent && skOrderItemInfoList.size() > ConfigureConstant.INT_2){ + backMessage.add(String.format(message, skOrderInfo.getXsddm(), "负数行订单明细不能超过两行")); + continue; + } if (CollectionUtils.isNotEmpty(skOrderItemInfoList)) { - DdpcxxReqBO ddpcxxReqBO = transitionReadData(skOrderInfo, skOrderItemInfoList, deptEntity); + DdpcxxReqBO ddpcxxReqBO = transitionReadData(fpresent && zpresent,skOrderInfo, skOrderItemInfoList, deptEntity); DdpcxxRspBO ddpcxxRspBO = allocateInvoiceInterfaceServiceImplV3.allocateInvoicesV3(ddpcxxReqBO, "", null, ConfigurerInfo.INTERFACE_VERSION_V6); log.debug("V3生成预制返回信息：{}", JSON.toJSONString(ddpcxxRspBO)); String format = String.format(message, skOrderInfo.getXsddm(), ddpcxxRspBO.getZTXX()); @@ -338,7 +344,7 @@ public class SkOrderServiceImpl implements OrderService { return ConfigureConstant.INT_1; } - public DdpcxxReqBO transitionReadData(SkOrderInfo skOrderInfo, List skOrderItemInfoList, DeptEntity deptEntity) { + public DdpcxxReqBO transitionReadData(boolean isZk, SkOrderInfo skOrderInfo, List skOrderItemInfoList, DeptEntity deptEntity) { TaxEquipmentInfo taxEquipmentInfo = simsBackService.queryTaxEquipment(deptEntity.getTaxpayerCode(), deptEntity.getDeptId()); @@ -387,7 +393,6 @@ public class SkOrderServiceImpl implements OrderService { String invoiceAmount = ConfigureConstant.STRING_0; String taxAmount = ConfigureConstant.STRING_0; - boolean isZk = skOrderItemInfoList.size()>ConfigureConstant.INT_1; String xmmc = skOrderItemInfoList.get(ConfigureConstant.INT_0).getCpmc(); if (isZk){ List collect = skOrderItemInfoList.stream().filter(item -> DecimalCalculateUtil.stringCompare(item.getHsje(), ConfigureConstant.STRING_0) > ConfigureConstant.INT_0).collect(Collectors.toList());