From 40e844ff2b1b446ee18ec6412e8b5b3bc9e0ecf8 Mon Sep 17 00:00:00 2001 From: gaorl Date: Fri, 26 May 2023 10:35:00 +0800 Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A=E8=AE=A2=E5=8D=95=E6=89=8B?= =?UTF-8?q?=E5=B7=A5=E6=8B=86=E5=88=86=E3=80=81=E6=98=8E=E7=BB=86=E8=A1=8C?= =?UTF-8?q?=E6=8B=86=E5=88=86=EF=BC=8C=E5=A6=82=E6=9E=9C=E9=83=A8=E5=88=86?= =?UTF-8?q?=E4=B8=BA=E6=88=90=E5=93=81=E6=B2=B9=E6=8B=86=E5=88=86=E5=AE=8C?= =?UTF-8?q?=EF=BC=8C=E9=9C=80=E8=A6=81=E4=BF=AE=E6=94=B9=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=A0=87=E5=BF=97=E4=B8=BA4=EF=BC=8C=E8=B6=858=E8=A1=8C?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E4=B8=BA1=EF=BC=8C=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E4=B8=BA0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/InvoiceServiceImpl.java | 9 +++++++-- .../service/impl/OrderCommonServiceImpl.java | 17 +++++++++++++++++ .../service/impl/OrderSplitServiceImpl.java | 8 ++++++++ 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java index cf780866..1b85ab18 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java @@ -268,11 +268,15 @@ public class InvoiceServiceImpl implements InvoiceService { OrderProcessInfo processInfo = f.getProcessInfo(); processInfo.setYzfp(ConfigureConstant.STRING_1); orderProcessService.updateOrderProcessInfoByProcessId(processInfo, null); + OrderInfo orderInfo = f.getOrderInfo(); if(ObjectUtil.isNotNull(taxClassCodeEntity) && ConfigureConstant.STRING_Y.equals(taxClassCodeEntity.getCpy())){ - OrderInfo orderInfo = f.getOrderInfo(); orderInfo.setQdBz(OrderInfoEnum.QDBZ_CODE_4.getKey()); - orderInfoService.updateOrderInfoByOrderId(orderInfo,null); + }else if(f.getOrderItemInfo().size() > 8){ + orderInfo.setQdBz(OrderInfoEnum.QDBZ_CODE_1.getKey()); + }else{ + orderInfo.setQdBz(OrderInfoEnum.QDBZ_CODE_0.getKey()); } + orderInfoService.updateOrderInfoByOrderId(orderInfo,null); } else if (orderSplit.size() > 1) { List commonOrderInfoSaveResults = new ArrayList<>(); @@ -282,6 +286,7 @@ public class InvoiceServiceImpl implements InvoiceService { OrderProcessInfo processInfo = orderProcessService.selectOrderProcessInfoByProcessId(s.getOrderInfo().getProcessId(),null); processInfo.setYzfp(ConfigureConstant.STRING_1); orderProcessService.updateOrderProcessInfoByProcessId(processInfo, null); +// }); } else { continue; diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderCommonServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderCommonServiceImpl.java index 048c7661..327833f1 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderCommonServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderCommonServiceImpl.java @@ -2,6 +2,8 @@ package com.dxhy.order.consumer.modules.order.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; +import com.dxhy.order.baseservice.module.taxclass.dao.TaxClassCodeMapper; +import com.dxhy.order.baseservice.module.taxclass.model.TaxClassCodeEntity; import com.dxhy.order.constant.ConfigureConstant; import com.dxhy.order.constant.OrderInfoContentEnum; import com.dxhy.order.constant.OrderInfoEnum; @@ -92,6 +94,9 @@ public class OrderCommonServiceImpl implements OrderCommonService { @Resource private BaseService baseService; + @Resource + private TaxClassCodeMapper taxClassCodeMapper; + @Override public String getGenerateShotKey() { return DistributedKeyMaker.generateShotKey(); @@ -1382,6 +1387,7 @@ public class OrderCommonServiceImpl implements OrderCommonService { } int i = 1; + int cpy = 0; for (OrderItemInfo orderItemInfo : comm.getOrderItemInfo()) { orderItemInfo.setOrderInfoId(orderInfo.getId()); if (StringUtils.isBlank(orderItemInfo.getXhfNsrsbh())) { @@ -1391,6 +1397,10 @@ public class OrderCommonServiceImpl implements OrderCommonService { orderItemInfo.setId(apiInvoiceCommonService.getGenerateShotKey()); orderItemInfo.setCreateTime(orderItemInfo.getCreateTime() == null ? new Date() : orderItemInfo.getCreateTime()); orderItemInfo.setSphxh(String.valueOf(i)); + TaxClassCodeEntity taxClassCodeEntity = taxClassCodeMapper.selectTaxClassCodeBySpbm(orderItemInfo.getSpbm()); + if(taxClassCodeEntity != null && "Y".contains(taxClassCodeEntity.getCpy())){ + cpy++; + } /** * 处理单价,保留非零位 */ @@ -1411,6 +1421,13 @@ public class OrderCommonServiceImpl implements OrderCommonService { } i++; } + if(cpy == comm.getOrderItemInfo().size()){ + orderInfo.setQdBz(OrderInfoEnum.QDBZ_CODE_4.getKey()); + }else if(comm.getOrderItemInfo().size() > 8){ + orderInfo.setQdBz(OrderInfoEnum.QDBZ_CODE_1.getKey()); + }else{ + orderInfo.setQdBz(OrderInfoEnum.QDBZ_CODE_0.getKey()); + } int insert = orderProcessInfoExtMapper.insertOrderProcessExt(orderExt); if (insert <= 0) { diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderSplitServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderSplitServiceImpl.java index 29e803c5..b81e53da 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderSplitServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderSplitServiceImpl.java @@ -262,9 +262,14 @@ public class OrderSplitServiceImpl implements OrderSplitService { CommonOrderInfo commonOrder = new CommonOrderInfo(); OrderInfo orderInfo = new OrderInfo(); List orderItemList = new ArrayList<>(); + int cpy = 0; for (PageOrderItemInfo pageOrderItemInfo : pageCommonOrderInfo.getOrderItemInfo()) { OrderItemInfo orderItemInfo = new OrderItemInfo(); BeanUtils.copyProperties(pageOrderItemInfo, orderItemInfo); + TaxClassCodeEntity taxClassCodeEntity = taxClassCodeMapper.selectTaxClassCodeBySpbm(orderItemInfo.getSpbm()); + if(taxClassCodeEntity != null && "Y".contains(taxClassCodeEntity.getCpy())){ + cpy++; + } orderItemList.add(orderItemInfo); } @@ -281,6 +286,9 @@ public class OrderSplitServiceImpl implements OrderSplitService { CommonUtils.resetQdbz(orderInfo); //重新计算清单标志 CommonUtils.setQdbz(orderInfo, orderItemList.size()); + if(cpy == pageCommonOrderInfo.getOrderItemInfo().size()){ + orderInfo.setQdBz(OrderInfoEnum.QDBZ_CODE_4.getKey()); + } CommonUtils.setQdXmmc(orderInfo); String cfDdh = oldDdh + CF + DECIMAL_FORMAT.format(i);