徽章增加活动id查询字段
This commit is contained in:
parent
65e90fd535
commit
df6669eba4
@ -51,7 +51,7 @@ public class ActivityRewardConfigBadgeQryExe {
|
|||||||
}
|
}
|
||||||
|
|
||||||
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(), cmd.getActivityId(), ruleIds);
|
||||||
|
|
||||||
MyTotalDrawCountCO drawCount = lotteryActivityRestService.getMyTotalDrawCount(cmd, cmd.getActivityId());
|
MyTotalDrawCountCO drawCount = lotteryActivityRestService.getMyTotalDrawCount(cmd, cmd.getActivityId());
|
||||||
|
|
||||||
@ -63,10 +63,11 @@ public class ActivityRewardConfigBadgeQryExe {
|
|||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
}
|
}
|
||||||
|
|
||||||
private Map<Long, UserActivityRewardClaim> getUserClaimMap(Long userId, List<Long> ruleIds) {
|
private Map<Long, UserActivityRewardClaim> getUserClaimMap(Long userId, Long activityId, List<Long> ruleIds) {
|
||||||
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)
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
@ -76,6 +76,7 @@ public class ClaimActivityRewardBadgeExe {
|
|||||||
long count = userActivityRewardClaimDAO.selectCount(
|
long count = userActivityRewardClaimDAO.selectCount(
|
||||||
new LambdaQueryWrapper<UserActivityRewardClaim>()
|
new LambdaQueryWrapper<UserActivityRewardClaim>()
|
||||||
.eq(UserActivityRewardClaim::getUserId, cmd.getReqUserId())
|
.eq(UserActivityRewardClaim::getUserId, cmd.getReqUserId())
|
||||||
|
.eq(UserActivityRewardClaim::getActivityId, cmd.getActivityId())
|
||||||
.eq(UserActivityRewardClaim::getRuleId, cmd.getRuleId())
|
.eq(UserActivityRewardClaim::getRuleId, cmd.getRuleId())
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user