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