feature：订单手工拆分、明细行拆分，如果部分为成品油拆分完，需要修改清单标志为4，超8行明细为1，默认为0

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<CommonOrderInfo> 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;

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) {

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<OrderItemInfo> 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);