|
@@ -386,12 +386,17 @@ public class CouponController {
|
|
|
for(int i=0; i<ids.size(); i++){
|
|
|
Integer couponId = Integer.valueOf(ids.get(i));
|
|
|
couponParam.setCouponId(couponId);
|
|
|
+
|
|
|
+ //用户能进入领取界面最多领取的张数
|
|
|
+
|
|
|
//领取成功的张数与该领取方式在当前页最多领取的张数
|
|
|
- if(couponSuccessNum <= couponIssueList.get(0).getGiveLimit()) {
|
|
|
+ if(couponSuccessNum < couponIssueList.get(0).getGiveLimit()) {
|
|
|
Coupon coupon = couponService.selectCouponTemplateInfo(couponParam);
|
|
|
//该优惠券是否存在
|
|
|
if(coupon != null) {
|
|
|
Integer couponCumulativeNum = coupon.getCouponCumulativeNum();
|
|
|
+
|
|
|
+
|
|
|
//该优惠券是否已被领完
|
|
|
if(coupon.getCouponNum() != null && coupon.getCouponNum() > 0) {
|
|
|
UserCoupon uc = new UserCoupon();
|