Unverified Commit b3c51ff7 authored by Timmy Zhang's avatar Timmy Zhang Committed by GitHub
Browse files

fix the bug of retrieve userCouponId (#371)

the original logic is wrong, it will just get the last coupon item of a user, mismatch the couponId and discount.
parent 0b0f95f3
...@@ -469,8 +469,7 @@ public class WxCartController { ...@@ -469,8 +469,7 @@ public class WxCartController {
int tmpCouponLength = 0; int tmpCouponLength = 0;
List<LitemallCouponUser> couponUserList = couponUserService.queryAll(userId); List<LitemallCouponUser> couponUserList = couponUserService.queryAll(userId);
for(LitemallCouponUser couponUser : couponUserList){ for(LitemallCouponUser couponUser : couponUserList){
tmpUserCouponId = couponUser.getId(); LitemallCoupon coupon = couponVerifyService.checkCoupon(userId, couponUser.getCouponId(), couponUser.getId(), checkedGoodsPrice);
LitemallCoupon coupon = couponVerifyService.checkCoupon(userId, couponUser.getCouponId(), tmpUserCouponId, checkedGoodsPrice);
if(coupon == null){ if(coupon == null){
continue; continue;
} }
...@@ -479,6 +478,7 @@ public class WxCartController { ...@@ -479,6 +478,7 @@ public class WxCartController {
if(tmpCouponPrice.compareTo(coupon.getDiscount()) == -1){ if(tmpCouponPrice.compareTo(coupon.getDiscount()) == -1){
tmpCouponPrice = coupon.getDiscount(); tmpCouponPrice = coupon.getDiscount();
tmpCouponId = coupon.getId(); tmpCouponId = coupon.getId();
tmpUserCouponId = couponUser.getId();
} }
} }
// 获取优惠券减免金额,优惠券可用数量 // 获取优惠券减免金额,优惠券可用数量
...@@ -541,4 +541,4 @@ public class WxCartController { ...@@ -541,4 +541,4 @@ public class WxCartController {
data.put("checkedGoodsList", checkedGoodsList); data.put("checkedGoodsList", checkedGoodsList);
return ResponseUtil.ok(data); return ResponseUtil.ok(data);
} }
} }
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment