|
|
|
@@ -201,9 +201,6 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity |
|
|
|
&& activityItem.getAwardsItemLimit() < limitCount){ |
|
|
|
limitCount = activityItem.getAwardsItemLimit(); |
|
|
|
} |
|
|
|
if(limitCount == 0){ |
|
|
|
activityItem.setIsMeet(false); |
|
|
|
} |
|
|
|
activityItem.setRealAwardsItemLimit(limitCount); |
|
|
|
} |
|
|
|
else if(EnumOfflineActivityType.GIFT.getCode().equals(activityItem.getType())){ |
|
|
|
@@ -392,7 +389,7 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity |
|
|
|
&& activityItem.getAwardsItemLimit() < limitCount){ |
|
|
|
limitCount = activityItem.getAwardsItemLimit(); |
|
|
|
} |
|
|
|
if(activityGrantItemList.stream().mapToInt(WxOfflineActivityGrantItem::getAwardCount).sum()>limitCount){ |
|
|
|
if(limitCount != 0 && activityGrantItemList.stream().mapToInt(WxOfflineActivityGrantItem::getAwardCount).sum()>limitCount){ |
|
|
|
throw new MallinkException(Result.ERROR, "活动项"+activityItem.getName()+"奖券超过限制"); |
|
|
|
} |
|
|
|
|
|
|
|
|