From 0bf04d62da3ce09c75c97ab7a342d85e202657fe Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Mon, 1 May 2023 20:08:53 +0800 Subject: [PATCH] =?UTF-8?q?feature=201.=E4=BF=AE=E5=A4=8D=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E8=AE=BE=E7=BD=AE=E7=9A=84=E9=99=90=E9=A2=9D=E6=9C=AA?= =?UTF-8?q?=E7=94=9F=E6=95=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/GenerateReadyOpenOrderServiceImpl.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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; }