diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/GenerateReadyOpenOrderServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/GenerateReadyOpenOrderServiceImpl.java index 3f83b034..7a3eba24 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/GenerateReadyOpenOrderServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/GenerateReadyOpenOrderServiceImpl.java @@ -473,7 +473,14 @@ public class GenerateReadyOpenOrderServiceImpl implements GenerateReadyOpenOrder OrderInfo orderInfo = common.getOrderInfo(); String hjbhsje = orderInfo.getHjbhsje(); if (new BigDecimal(hjbhsje).compareTo(new BigDecimal(taxDiskLimit)) > 0) { - limit = taxDiskLimit; + //如果设置的含税限额小于税盘的限额(不含税)则按照客户设置的限额来 + if(new BigDecimal(customLimit).compareTo(new BigDecimal(taxDiskLimit)) < 0){ + hsbz = OrderInfoEnum.HSBZ_1.getKey(); + limit = customLimit; + } else { + hsbz = OrderInfoEnum.HSBZ_0.getKey(); + limit = taxDiskLimit; + } } else { limit = customLimit; }