From 289f3ce2ad0aee3e8eff0a6c5c71e39d426d835f Mon Sep 17 00:00:00 2001 From: Agent Date: Fri, 27 Mar 2026 15:33:35 +0000 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BC=98=E6=83=A0?= =?UTF-8?q?=E9=87=91=E9=A2=9D=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91=EF=BC=8C?= =?UTF-8?q?>=3D0=E6=97=B6=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/building/service/impl/OrderServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/example/building/service/impl/OrderServiceImpl.java b/src/main/java/com/example/building/service/impl/OrderServiceImpl.java index 0fbd7fb..f734cd7 100644 --- a/src/main/java/com/example/building/service/impl/OrderServiceImpl.java +++ b/src/main/java/com/example/building/service/impl/OrderServiceImpl.java @@ -121,8 +121,8 @@ public class OrderServiceImpl implements OrderService { BigDecimal discountRate = order.getDiscountRate(); BigDecimal discountMoney = request.getDiscountMoney(); - // 优先使用优惠金额，如果没有填则用折扣率计算 - if (discountMoney != null && discountMoney.compareTo(BigDecimal.ZERO) > 0) { + // 如果优惠金额大于0，直接使用；否则用折扣率计算 + if (discountMoney != null && discountMoney.compareTo(BigDecimal.ZERO) >= 0) { discountAmount = discountMoney; } else { // 折扣率默认100，即不打折 @@ -358,8 +358,8 @@ public class OrderServiceImpl implements OrderService { BigDecimal discountRate = order.getDiscountRate(); BigDecimal discountMoney = order.getDiscountMoney(); - // 优先使用优惠金额，如果没有填则用折扣率计算 - if (discountMoney != null && discountMoney.compareTo(BigDecimal.ZERO) > 0) { + // 如果优惠金额大于等于0，直接使用；否则用折扣率计算 + if (discountMoney != null && discountMoney.compareTo(BigDecimal.ZERO) >= 0) { discountAmount = discountMoney; } else { if (discountRate == null) {