修改优惠券校验
This commit is contained in:
parent
8e1bf81d55
commit
7f2d31129d
|
@ -665,7 +665,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> 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<OrdersDao, Orders> 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<OrdersDao, Orders> 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);
|
||||
|
|
|
@ -190,7 +190,7 @@ public class UserPackageOrderServiceImpl extends ServiceImpl<UserPackageOrderDao
|
|||
return Result.error("优惠券不满足使用条件!");
|
||||
}
|
||||
}
|
||||
couponMinMoney = couponMinMoney.add(couponUser.getMinMoney());
|
||||
couponMinMoney = couponMinMoney.add(couponUser.getMoney());
|
||||
CouponUserList.add(couponUser);
|
||||
BigDecimal money= couponUser.getMoney();
|
||||
couponMoney = couponMoney.add(money);
|
||||
|
|
Loading…
Reference in New Issue