From 6410ff6aef93443322da7355fcb326a22b477c14 Mon Sep 17 00:00:00 2001 From: xjm Date: Fri, 22 Dec 2023 15:19:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=98=E6=89=A3=E7=A0=82=E7=AB=99=E6=8E=92?= =?UTF-8?q?=E9=99=A4=E8=97=95=E5=B1=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../local/ssjygl/order/ordertemp/OrderTempSyncService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java index 6de2bbd..0cb65ac 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java @@ -731,7 +731,7 @@ public class OrderTempSyncService { // 根据客户消息判断是否需要打折 CustomerDiscount customerDiscount = CustomerDiscountService.me.getDiscountByCustomerId(customer.getId()); // 预付费结算 - if (Objects.nonNull(customerDiscount) && Objects.nonNull(customerDiscount.getDiscount())){ + if (Objects.nonNull(customerDiscount) && Objects.nonNull(customerDiscount.getDiscount()) && 12 != transport.getSupermarketId()){ net_weight = net_weight.multiply(BigDecimal.valueOf(customerDiscount.getDiscount()/100)); } @@ -1129,7 +1129,7 @@ public class OrderTempSyncService { // 根据客户消息判断是否需要打折 CustomerDiscount customerDiscount = CustomerDiscountService.me.getDiscountByCustomerId(customer.getId()); // 预付费结算 - if (Objects.nonNull(customerDiscount) && Objects.nonNull(customerDiscount.getDiscount())){ + if (Objects.nonNull(customerDiscount) && Objects.nonNull(customerDiscount.getDiscount())&& 12 != transport.getSupermarketId()){ net_weight = net_weight.multiply(BigDecimal.valueOf(customerDiscount.getDiscount()/100)); }