From d0c57a6f9d6b7e9c56769c0511bfa316c77f8293 Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Fri, 21 Jul 2023 16:08:20 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feature=201.=E5=8E=BB=E9=99=A4=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/order/consumer/utils/BeanTransitionUtils.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java index 84c99a3f..b04e7536 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java +++ b/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()); From 0465eaeb0546127ac0145529be13ee4659c5a295 Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Fri, 21 Jul 2023 16:34:01 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feature=201.=E8=B0=83=E6=95=B4=E5=8D=95?= =?UTF-8?q?=E4=BB=B7=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/order/consumer/utils/BeanTransitionUtils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java index b04e7536..a4569c56 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java @@ -3618,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(""); }