From 7f2d31129db437a2181a1910190fe9c00ce95a78 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Fri, 12 Jul 2024 18:12:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=98=E6=83=A0=E5=88=B8?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/artificer/service/impl/OrdersServiceImpl.java | 8 ++++++-- .../order/service/impl/UserPackageOrderServiceImpl.java | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java b/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java index 02e8077..cd682cb 100644 --- a/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java +++ b/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java @@ -665,7 +665,7 @@ public class OrdersServiceImpl extends ServiceImpl implements return Result.error("优惠券不满足使用条件！"); } } - couponMinMoney = couponMinMoney.add(couponUser.getMinMoney()); + couponMinMoney = couponMinMoney.add(couponUser.getMoney()); CouponUserList.add(couponUser); BigDecimal money= couponUser.getMoney(); couponMoney = couponMoney.add(money); @@ -673,6 +673,10 @@ public class OrdersServiceImpl extends ServiceImpl implements couponNameSb.append(","); } } + + if(couponMoney.compareTo(couponMinMoney) < 0){ + return Result.error("当前应付总金额不满足优惠券使用的最小额度，请重新选择优惠券！"); + } orders.setCouponName(couponNameSb.toString()); orders.setCouponMoney(couponMoney); }else{ @@ -1721,7 +1725,7 @@ public class OrdersServiceImpl extends ServiceImpl implements return Result.error("优惠券不满足使用条件！"); } } - couponMinMoney = couponMinMoney.add(couponUser.getMinMoney()); + couponMinMoney = couponMinMoney.add(couponUser.getMoney()); CouponUserList.add(couponUser); BigDecimal money = couponUser.getMoney(); couponMoney = couponMoney.add(money); diff --git a/src/main/java/com/sqx/modules/bl/order/service/impl/UserPackageOrderServiceImpl.java b/src/main/java/com/sqx/modules/bl/order/service/impl/UserPackageOrderServiceImpl.java index cc92bfa..6d6be08 100644 --- a/src/main/java/com/sqx/modules/bl/order/service/impl/UserPackageOrderServiceImpl.java +++ b/src/main/java/com/sqx/modules/bl/order/service/impl/UserPackageOrderServiceImpl.java @@ -190,7 +190,7 @@ public class UserPackageOrderServiceImpl extends ServiceImpl