From ecbb672f60dd9916e7c9f2668e5363bc466bfaf0 Mon Sep 17 00:00:00 2001 From: tianfeng <769204422@qq.com> Date: Wed, 11 Feb 2026 12:30:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E9=A2=86=E5=A5=96=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/command/activity/ActivityRewardConfigQryExe.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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) );