|
@@ -437,8 +437,8 @@ public class UserOrderServiceImpl implements UserOrderService {
|
|
|
if (new Date().after(couponInfo.getBeginTime()) && new Date().before(couponInfo.getEndTime())) {//在可用时间内
|
|
if (new Date().after(couponInfo.getBeginTime()) && new Date().before(couponInfo.getEndTime())) {//在可用时间内
|
|
|
BigDecimal discountMoney = couponInfo.getDiscountMoney();
|
|
BigDecimal discountMoney = couponInfo.getDiscountMoney();
|
|
|
BigDecimal limitMoney = couponInfo.getLimitMoney();
|
|
BigDecimal limitMoney = couponInfo.getLimitMoney();
|
|
|
- if (totlePrice.compareTo(limitMoney) > 0) {
|
|
|
|
|
- dealPrice = totlePrice.subtract(discountMoney);
|
|
|
|
|
|
|
+ if (activityDealPrice.compareTo(limitMoney) > 0) {
|
|
|
|
|
+ dealPrice = activityDealPrice.subtract(discountMoney);
|
|
|
|
|
|
|
|
userCoupon.setIsUsed("Y");
|
|
userCoupon.setIsUsed("Y");
|
|
|
userCouponMapper.updateByPrimaryKeySelective(userCoupon);
|
|
userCouponMapper.updateByPrimaryKeySelective(userCoupon);
|