Merge branch 'test' of http://192.168.12.182/invoice/sims-order into test

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

@@ -3522,6 +3522,9 @@ public class BeanTransitionUtils {
             ddtxxBO.setHJJE(req.getZBHSJE());
             ddtxxBO.setHJSE(req.getZZSE());
             ddtxxBO.setDDH(req.getZJSDH());
+            if(StringUtils.isNotBlank(req.getZSNYX()) && ConfigureConstant.STRING_X.equals(req.getZSNYX())){
+                ddtxxBO.setDDH("");
+            }
             ddtxxBO.setBZDH(req.getZBZDH());
             ddtxxBO.setXTLY(isinput.getSYSID());
             //如果为X,表示数据来自电商系统，开票完成后需要推送给电商系统开票数据及板式文件。
@@ -3541,7 +3544,7 @@ public class BeanTransitionUtils {
             if(StringUtils.isNotBlank(req.getZDSXT()) && StringUtils.isNotBlank(req.getZDSYWFL())){
                 ddtxxBO.setXTLY(OrderInfoEnum.SYS_SOURCE_DSXT.getKey()+req.getZDSYWFL());
             }
-            if(StringUtils.isNotBlank(req.getZSNYX())){
+            if(StringUtils.isNotBlank(req.getZSNYX()) && ConfigureConstant.STRING_X.equals(req.getZSNYX())){
                 ddtxxBO.setXTLY(OrderInfoEnum.SYS_SOURCE_SNYXX.getKey());
             }
             ddtxxBO.setGSDM(req.getBUKRS());
@@ -3615,8 +3618,8 @@ public class BeanTransitionUtils {
                 ddmxxxBO.setPH(detail.getCHARG());
                 ddmxxxBO.setKB(ObjectUtil.isNull(detail.getKTYPE())?"":detail.getKTYPE()+(ObjectUtil.isNull(detail.getKNAME())?"":detail.getKNAME()));
                 BigDecimal decimal = new BigDecimal("0");
-                if(StringUtils.isNotBlank(ddmxxxBO.getJE()) && decimal.compareTo(new BigDecimal(ddmxxxBO.getJE())) == 0) {
-                    ddmxxxBO.setJE("");
+                if(StringUtils.isNotBlank(ddmxxxBO.getDJ()) && decimal.compareTo(new BigDecimal(ddmxxxBO.getDJ())) == 0) {
+                    ddmxxxBO.setDJ("");
                 } else if (StringUtils.isNotBlank(ddmxxxBO.getSPSL()) && decimal.compareTo(new BigDecimal(ddmxxxBO.getSPSL())) == 0) {
                     ddmxxxBO.setSPSL("");
                 }