diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/activity/ActivityRewardConfigBadgeQryExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/activity/ActivityRewardConfigBadgeQryExe.java index 34ab7b28..b34f8753 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/activity/ActivityRewardConfigBadgeQryExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/activity/ActivityRewardConfigBadgeQryExe.java @@ -51,7 +51,7 @@ public class ActivityRewardConfigBadgeQryExe { } List ruleIds = ruleConfigs.stream().map(ActivityPropsRule::getId).collect(Collectors.toList()); - Map claimMap = getUserClaimMap(cmd.getReqUserId(), ruleIds); + Map claimMap = getUserClaimMap(cmd.getReqUserId(), cmd.getActivityId(), ruleIds); MyTotalDrawCountCO drawCount = lotteryActivityRestService.getMyTotalDrawCount(cmd, cmd.getActivityId()); @@ -63,10 +63,11 @@ public class ActivityRewardConfigBadgeQryExe { .collect(Collectors.toList()); } - private Map getUserClaimMap(Long userId, List ruleIds) { + private Map getUserClaimMap(Long userId, Long activityId, List ruleIds) { List claims = userActivityRewardClaimDAO.selectList( new LambdaQueryWrapper() .eq(UserActivityRewardClaim::getUserId, userId) + .eq(UserActivityRewardClaim::getActivityId, activityId) .in(UserActivityRewardClaim::getRuleId, ruleIds) ); diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/activity/ClaimActivityRewardBadgeExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/activity/ClaimActivityRewardBadgeExe.java index c343c282..817abe3d 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/activity/ClaimActivityRewardBadgeExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/activity/ClaimActivityRewardBadgeExe.java @@ -76,6 +76,7 @@ public class ClaimActivityRewardBadgeExe { long count = userActivityRewardClaimDAO.selectCount( new LambdaQueryWrapper() .eq(UserActivityRewardClaim::getUserId, cmd.getReqUserId()) + .eq(UserActivityRewardClaim::getActivityId, cmd.getActivityId()) .eq(UserActivityRewardClaim::getRuleId, cmd.getRuleId()) );