From df6669eba434201e38bac23cd2f6ee8ac4ed0d47 Mon Sep 17 00:00:00 2001 From: tianfeng <769204422@qq.com> Date: Thu, 12 Feb 2026 11:21:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=BD=E7=AB=A0=E5=A2=9E=E5=8A=A0=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8id=E6=9F=A5=E8=AF=A2=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../command/activity/ActivityRewardConfigBadgeQryExe.java | 5 +++-- .../app/command/activity/ClaimActivityRewardBadgeExe.java | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) 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()) );