feature 1.拆分逻辑修改

order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/api/InvoiceOpenGateRestApi.java

@@ -107,7 +107,7 @@ public class InvoiceOpenGateRestApi {
 
         } catch (Exception e) {
             e.printStackTrace();
-            log.error("{}-处理业务出现异常,异常原因为:{}", LOGGER_MESSAGE_V6, e.getMessage());
+            log.error("{}-处理业务出现异常,异常原因为:{}", LOGGER_MESSAGE_V6, e);
             PoCommonResponseParam poCommonResponseParam = new PoCommonResponseParam();
             EsOutput esOutput = new EsOutput();
             esOutput.setBSKEY("");

order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java

@@ -3636,19 +3636,40 @@ public class BeanTransitionUtils {
         }
 
         //如果是山能易行按照物料编码分组拆分订单
-        if(StringUtils.isNotBlank(ddtxxBO.getXTLY())){
+        if(StringUtils.isNotBlank(ddtxxBO.getXTLY()) && OrderInfoEnum.SYS_SOURCE_SNYXX.getKey().equals(ddtxxBO.getXTLY())){
             Map<String, List<DdmxxxBO>> collect = ddmxList.stream().collect(Collectors.groupingBy(t -> t.getZXBM()));
             for (int i = 0; i < collect.size(); i++) {
                 DdzxxBO ddzxxBONew = new DdzxxBO();
                 DdtxxBO ddtxxBONew = new DdtxxBO();
                 List<DdmxxxBO> ddmxLists = new ArrayList<>();
                 BeanUtils.copyProperties(ddtxxBO,ddtxxBONew);
-                ddmxLists.addAll(collect.get(i));
+                List<DdmxxxBO> ddmxxxBOS = collect.get(i);
+                BigDecimal zje = new BigDecimal("0.00");
+                BigDecimal bhsje = new BigDecimal("0.00");
+                BigDecimal se = new BigDecimal("0.00");
+                for (DdmxxxBO ddmxxxBO : ddmxxxBOS) {
+                    if(StringUtils.isNotBlank(ddmxxxBO.getHSBZ()) && OrderInfoEnum.HSBZ_0.equals(ddmxxxBO.getHSBZ())){
+                        //不含稅
+                        BigDecimal bigDecimal = new BigDecimal(ddmxxxBO.getJE()).add(new BigDecimal(ddmxxxBO.getSE()));
+                        zje = zje.add(bigDecimal);
+                        bhsje = bhsje.add(new BigDecimal(ddmxxxBO.getJE()));
+                        se = se.add(new BigDecimal(ddmxxxBO.getSE()));
+                    } else {
+                        //含稅
+                        zje = zje.add(new BigDecimal(ddmxxxBO.getJE()));
+                    }
+                }
+                ddtxxBO.setHJJE(bhsje.toPlainString());
+                ddtxxBO.setHJSE(se.toPlainString());
+                ddtxxBO.setJSHJ(zje.toPlainString());
+                ddmxLists.addAll(ddmxxxBOS);
 
                 ddzxxBONew.setDDTXX(ddtxxBO);
-                ddzxxBONew.setDDMXXX(ddmxList);
+                ddzxxBONew.setDDMXXX(ddmxLists);
                 ddzxxList.add(ddzxxBONew);
+
             }
+
         }else{
             ddzxxBO.setDDTXX(ddtxxBO);
             ddzxxBO.setDDMXXX(ddmxList);