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 0e91bf1d..3660b6af 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 @@ -972,7 +972,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/order/service/impl/OrderInfoServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java index 2d541e06..dde3982f 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 @@ -1524,6 +1524,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()); } 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;