diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/activity/ActivityRewardConfigQryExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/activity/ActivityRewardConfigQryExe.java index 3ea4c247..9c547ff3 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/activity/ActivityRewardConfigQryExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/activity/ActivityRewardConfigQryExe.java @@ -48,7 +48,7 @@ public class ActivityRewardConfigQryExe { } List ruleIds = ruleConfigs.stream().map(ActivityPropsRule::getId).collect(Collectors.toList()); - Map claimMap = getUserClaimMap(cmd.getReqUserId(), ruleIds); + Map claimMap = getUserClaimMap(cmd.getReqUserId(), ruleIds, cmd.getActivityId()); BigDecimal userTotalAmount = userActivityRechargeService.getUserTotalAmount( cmd.getReqUserId(), @@ -66,10 +66,11 @@ public class ActivityRewardConfigQryExe { .collect(Collectors.toList()); } - private Map getUserClaimMap(Long userId, List ruleIds) { + private Map getUserClaimMap(Long userId, List ruleIds, Long activityId) { List claims = userActivityRewardClaimDAO.selectList( new LambdaQueryWrapper() .eq(UserActivityRewardClaim::getUserId, userId) + .eq(UserActivityRewardClaim::getActivityId, activityId) .in(UserActivityRewardClaim::getRuleId, ruleIds) );