From 430bd4a4af02537a2e9d1fd6bfcae40e40218c46 Mon Sep 17 00:00:00 2001 From: wangrangrang Date: Tue, 24 Oct 2023 16:47:54 +0800 Subject: [PATCH 1/3] =?UTF-8?q?split=E6=94=B9=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- order-management-consumer/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/order-management-consumer/pom.xml b/order-management-consumer/pom.xml index 82cb229f..d62ea91f 100644 --- a/order-management-consumer/pom.xml +++ b/order-management-consumer/pom.xml @@ -282,7 +282,7 @@ com.dxhy.base sims-base-order-split - 1.0.4-sdenergy + 1.0.3.release-sdenergy compile From aea1fa3c82750c3c26ebce64ea845d3e578ce8ed Mon Sep 17 00:00:00 2001 From: wangrangrang Date: Tue, 24 Oct 2023 18:31:56 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/dxhy/order/constant/OrderInfoContentEnum.java | 2 +- .../service/impl/ValidateInterfaceOrderServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoContentEnum.java b/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoContentEnum.java index 31e02916..3f503228 100644 --- a/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoContentEnum.java +++ b/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoContentEnum.java @@ -970,7 +970,7 @@ public enum OrderInfoContentEnum { CHECK_ISS7PRI_107151("107151", "订单明细信息中项目数量不能为空且不能为0"), - CHECK_ISS7PRI_107152("107152", "订单明细信息中项目单价必须为正数且保留小数点后8位,全电票小数点后15位"), + CHECK_ISS7PRI_107152("107152", "订单明细信息中项目单价必须为正数且保留小数点后8位,全电票小数点后13位"), CHECK_ISS7PRI_107153("107153", "订单明细信息中项目数量不合法或保留小数点后8位,全电票小数点后15位"), diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/validate/service/impl/ValidateInterfaceOrderServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/validate/service/impl/ValidateInterfaceOrderServiceImpl.java index f3b5303e..fbbad2ac 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/validate/service/impl/ValidateInterfaceOrderServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/validate/service/impl/ValidateInterfaceOrderServiceImpl.java @@ -2792,7 +2792,7 @@ public class ValidateInterfaceOrderServiceImpl implements ValidateInterfaceOrder */ //校验单价 if (StringUtils.isNotBlank(orderItemInfo.getXmdj())) { - //判断小数点后位数,默认为8位,如果为全电,为15位 + //判断小数点后位数,默认为8位,如果为全电,为13位 String patternXmdj = PatternConstant.PATTERN_XMDJ; if(CommonUtils.judgeIsQdfp("",fpzldm)){ patternXmdj = PatternConstant.PATTERN_QD_XMDJ; From 15f621d75164ef382c0d96c21ba5f3331dd4a764 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Fri, 27 Oct 2023 08:56:12 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=BA=A2=E5=AD=97=E5=8F=91=E7=A5=A8?= =?UTF-8?q?=E5=BC=80=E5=85=B7=E6=A0=B9=E6=8D=AE=E6=8A=A5=E8=B4=A6=E5=8D=95?= =?UTF-8?q?=E5=8F=B7=E6=9F=A5=E8=AF=A2=E8=AE=A2=E5=8D=95=E8=BF=87=E7=A8=8B?= =?UTF-8?q?=E8=A1=A8=E6=97=B6=E6=B7=BB=E5=8A=A0=E8=AE=A2=E5=8D=95=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E4=B8=BA=E6=9C=89=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/order/service/impl/OrderInfoServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java index 6648f5d5..61f3da30 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java @@ -1525,6 +1525,7 @@ public class OrderInfoServiceImpl implements OrderInfoService { if(StrUtil.isNotBlank(commonOrderInfo.getOrderInfo().getBzdh())){ Map map = new HashMap(); map.put("bzdh",commonOrderInfo.getOrderInfo().getBzdh().trim()); + map.put("orderStatus",ConfigureConstant.STRING_0); if(StringUtils.isNotBlank(commonOrderInfo.getOrderInfo().getDdh())){ map.put("ddh",commonOrderInfo.getOrderInfo().getDdh().trim()); }