待领奖状态处理

This commit is contained in:
tianfeng 2026-02-11 12:30:12 +08:00
parent f8ad2426fd
commit ecbb672f60

View File

@ -48,7 +48,7 @@ public class ActivityRewardConfigQryExe {
} }
List<Long> ruleIds = ruleConfigs.stream().map(ActivityPropsRule::getId).collect(Collectors.toList()); List<Long> ruleIds = ruleConfigs.stream().map(ActivityPropsRule::getId).collect(Collectors.toList());
Map<Long, UserActivityRewardClaim> claimMap = getUserClaimMap(cmd.getReqUserId(), ruleIds); Map<Long, UserActivityRewardClaim> claimMap = getUserClaimMap(cmd.getReqUserId(), ruleIds, cmd.getActivityId());
BigDecimal userTotalAmount = userActivityRechargeService.getUserTotalAmount( BigDecimal userTotalAmount = userActivityRechargeService.getUserTotalAmount(
cmd.getReqUserId(), cmd.getReqUserId(),
@ -66,10 +66,11 @@ public class ActivityRewardConfigQryExe {
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
private Map<Long, UserActivityRewardClaim> getUserClaimMap(Long userId, List<Long> ruleIds) { private Map<Long, UserActivityRewardClaim> getUserClaimMap(Long userId, List<Long> ruleIds, Long activityId) {
List<UserActivityRewardClaim> claims = userActivityRewardClaimDAO.selectList( List<UserActivityRewardClaim> claims = userActivityRewardClaimDAO.selectList(
new LambdaQueryWrapper<UserActivityRewardClaim>() new LambdaQueryWrapper<UserActivityRewardClaim>()
.eq(UserActivityRewardClaim::getUserId, userId) .eq(UserActivityRewardClaim::getUserId, userId)
.eq(UserActivityRewardClaim::getActivityId, activityId)
.in(UserActivityRewardClaim::getRuleId, ruleIds) .in(UserActivityRewardClaim::getRuleId, ruleIds)
); );