|
|
@@ -823,7 +823,7 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity |
|
|
} |
|
|
} |
|
|
//所得奖项不能重复, 后续计算问题 |
|
|
//所得奖项不能重复, 后续计算问题 |
|
|
boolean isRepeat = activityGrantItemList.stream() |
|
|
boolean isRepeat = activityGrantItemList.stream() |
|
|
.collect(groupingBy(e -> String.valueOf(e.getAwardItamId())+String.valueOf(e.getRecordId()), counting())) |
|
|
|
|
|
|
|
|
.collect(groupingBy(e -> String.valueOf(e.getAwardItamId())+String.valueOf(e.getGrantAwardsMode())+String.valueOf(e.getRecordId()), counting())) |
|
|
.entrySet().stream().anyMatch(e -> e.getValue() > 1); |
|
|
.entrySet().stream().anyMatch(e -> e.getValue() > 1); |
|
|
if(isRepeat){ |
|
|
if(isRepeat){ |
|
|
throw new MallinkException(Result.ERROR, "请检查赠礼活动奖项存在重复"); |
|
|
throw new MallinkException(Result.ERROR, "请检查赠礼活动奖项存在重复"); |
|
|
|