Merge branch 'release' of http://10.1.1.216/xm/sdenergy/sims/sims-order-sdenergy into release

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

@@ -3545,13 +3545,13 @@ public class BeanTransitionUtils {
                 if(StringUtils.isNotBlank(detail.getZZSE()) && StringUtils.isNotBlank(detail.getZBHSJE())){
                     String zje = DecimalCalculateUtil.bigDecimalAdd(detail.getZZSE(), detail.getZBHSJE());
                     if(DecimalCalculateUtil.stringCompare(zje,detail.getZHSJE()) != 0){
-                        ddmxxxBO.setJE(detail.getZBHSJE());
-                        ddmxxxBO.setHSBZ(ConfigureConstant.STRING_0);
-                        ddmxxxBO.setSE(detail.getZZSE());
-                    }else {
                         log.info("SAP推送的不含税金额+税额不相等,传入的总金额:{},计算后的XMJE:{}",detail.getZHSJE(),zje);
                         ddmxxxBO.setJE(detail.getZHSJE());
                         ddmxxxBO.setHSBZ(ConfigureConstant.STRING_1);
+                    }else {
+                        ddmxxxBO.setJE(detail.getZBHSJE());
+                        ddmxxxBO.setHSBZ(ConfigureConstant.STRING_0);
+                        ddmxxxBO.setSE(detail.getZZSE());
                     }
                 } else {
                     ddmxxxBO.setJE(detail.getZHSJE());
@@ -3577,6 +3577,11 @@ public class BeanTransitionUtils {
                 }
                 ddmxList.add(ddmxxxBO);
             }
+            boolean match = ddmxList.stream().allMatch(mx -> ConfigureConstant.STRING_1.equals(mx.getHSBZ()));
+            if(match){
+                ddtxxBO.setHJJE("0");
+                ddtxxBO.setHJSE("0");
+            }
         }
         ddzxxBO.setDDTXX(ddtxxBO);
         ddzxxBO.setDDMXXX(ddmxList);
@@ -3588,8 +3593,8 @@ public class BeanTransitionUtils {
     }
 
     public static void main(String[] args) {
-        String zje = DecimalCalculateUtil.bigDecimalAdd("60561.96", "465861.19");
+        String zje = DecimalCalculateUtil.bigDecimalAdd("2", "1");
-        if(DecimalCalculateUtil.stringCompare(zje,"526423.15") != 0){
+        if(DecimalCalculateUtil.stringCompare(zje,"3") != 0){
             System.out.println("00");
         }
         System.out.println("988989");