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 f723feb5..8797c8a2 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 @@ -640,7 +640,7 @@ public enum OrderInfoContentEnum { CHECK_ISS7PRI_107026("107026", "订单主体信息中销货方地址", 1, 100, true, true), - CHECK_ISS7PRI_107028("107028", "订单主体信息中销货方电话", 1, 20, true, true), + CHECK_ISS7PRI_107028("107028", "订单主体信息中销货方电话", 1, 30, true, true), CHECK_ISS7PRI_107029("107029", "订单主体信息中销货方银行名称", 0, 100, true, false), @@ -1062,7 +1062,7 @@ public enum OrderInfoContentEnum { QD_CHECK_ISS7PRI_107282("107282", "订单主体信息中销货方地址", 1, 300, true, false), - CHECK_ISS7PRI_107283("107283", "订单主体信息中销货方电话", 1, 20, true, false), + CHECK_ISS7PRI_107283("107283", "订单主体信息中销货方电话", 1, 30, true, false), QD_CHECK_ISS7PRI_107283("107283", "订单主体信息中销货方电话", 1, 60, true, false), @@ -1265,9 +1265,9 @@ public enum OrderInfoContentEnum { CHECK_ISS7PRI_109125A("109125", "二手车订单主体信息中二手车销货方地址", 0, 80, true, false), - CHECK_ISS7PRI_109126("109126", "二手车订单主体信息中二手车销货方电话", 1, 20, true, true), + CHECK_ISS7PRI_109126("109126", "二手车订单主体信息中二手车销货方电话", 1, 30, true, true), - CHECK_ISS7PRI_109126A("109126", "二手车订单主体信息中二手车销货方电话", 0, 20, true, false), + CHECK_ISS7PRI_109126A("109126", "二手车订单主体信息中二手车销货方电话", 0, 30, true, false), /** * 全电订单信息校验 @@ -2096,7 +2096,7 @@ public enum OrderInfoContentEnum { INVOICE_HEAD_INFO_XHFMC_ERROR_144012A("144012", "销货方名称", 1, 300, true, true), INVOICE_HEAD_INFO_XHFDZ_ERROR_144013("144013", "销货方地址", 1, 100, true, true), INVOICE_HEAD_INFO_XHFDZ_ERROR_144013A("144013", "销货方地址", 1, 300, true, false), - INVOICE_HEAD_INFO_XHFDH_ERROR_144014("144014", "销货方电话", 1, 20, true, false), + INVOICE_HEAD_INFO_XHFDH_ERROR_144014("144014", "销货方电话", 1, 30, true, false), INVOICE_HEAD_INFO_XHFDH_ERROR_144014A("144014", "销货方电话", 1, 60, true, false), INVOICE_HEAD_INFO_XHFYH_ERROR_144015("144015", "销货方银行名称", 0, 100, true, false), INVOICE_HEAD_INFO_XHFYH_ERROR_144015A("144015", "销货方银行名称", 0, 120, true, false), 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 76383b39..9cca1e03 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 @@ -3550,12 +3550,9 @@ public class BeanTransitionUtils { if(CommonUtils.judgeIsQdfp("",ddpcxxBO.getFPLXDM())){ afterPointLength = ConfigureConstant.INT_15; } - String jsXmdj = DecimalCalculateUtil.divNew(ddmxxxBO.getJE(), ddmxxxBO.getSPSL(), afterPointLength); - if (DecimalCalculateUtil.stringCompare(jsXmdj, ddmxxxBO.getDJ()) != 0) { - log.info("项目金额有误,误差不能大于1分钱,开始进行单价反算,JE:{},SPSL:{}",ddmxxxBO.getJE(), ddmxxxBO.getSPSL()); - //判断小数点后位数,默认为8位,如果为全电,为15位 - String xmdj = DecimalCalculateUtil.divNew(ddmxxxBO.getJE(), ddmxxxBO.getSPSL(), afterPointLength); - log.info("项目金额有误,误差不能大于1分钱,计算后的XMDJ:{}",xmdj); + String xmdj = DecimalCalculateUtil.divNew(ddmxxxBO.getJE(), ddmxxxBO.getSPSL(), afterPointLength); + if (DecimalCalculateUtil.stringCompare(xmdj, ddmxxxBO.getDJ()) != 0) { + log.info("项目金额有误,误差不能大于1分钱,开始进行单价反算,JE:{},SPSL:{},计算后的XMDJ:{}",ddmxxxBO.getJE(), ddmxxxBO.getSPSL(),xmdj); ddmxxxBO.setDJ(xmdj); } }