hy/aslan-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

周星发送奖励定时任务更改

Browse Source
This commit is contained in:
tianfeng 2025-09-19 16:33:10 +08:00
parent b5b9fd4e04
commit fbf7559503
1 changed files with 26 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/manager/activity/award/WeeklyRewardsSentManager.java
View File

@ -460,25 +460,20 @@ public class WeeklyRewardsSentManager {
log.warn("统一奖励配置: {}.系统:{}", JacksonUtils.toJson(activityResources), sysOrigin.name()); log.warn("统一奖励配置: {}.系统:{}", JacksonUtils.toJson(activityResources), sysOrigin.name());
// 循环处理每个礼物
for (int resourcesIndex = 0; resourcesIndex < gifts.size(); resourcesIndex++) {
// 获取当前礼物的Top3用户 // 获取当前礼物的Top3用户
List<WeekStarGiftCount> giftUsers = weekStarGiftCountService List<WeekStarGiftCount> giftUsers = weekStarGiftCountService
.listLastWeekTop(sysOrigin.name(), gifts.get(resourcesIndex).getId(), 3); .listThisWeekTopV2(sysOrigin.name(),3);
if (CollectionUtils.isEmpty(giftUsers)) { if (CollectionUtils.isEmpty(giftUsers)) {
log.warn("周星奖励主动发送:活动礼物序号{}， 活动礼物ID: {},没有获奖用户.系统:{}", log.warn("没有获奖用户.系统:{}", sysOrigin.name());
resourcesIndex + 1, return;
gifts.get(resourcesIndex).getId(), sysOrigin.name());
continue;
} }
// 给具体用户发统一奖励组 // 给具体用户发统一奖励组
for (int userIndex = 0; userIndex < giftUsers.size(); userIndex++) { for (int userIndex = 0; userIndex < giftUsers.size(); userIndex++) {
ActivityResourceCO detailedAward = activityResources.get(userIndex); ActivityResourceCO detailedAward = activityResources.get(userIndex);
if (Objects.isNull(detailedAward)) { if (Objects.isNull(detailedAward) || !Boolean.TRUE.equals(detailedAward.getPropsGroup().getShelfStatus())) {
log.warn("周星奖励主动发送:统一奖励组中top{} 配置不存在.系统:{}", log.warn("周星奖励主动发送:统一奖励组中top{} 配置不存在.系统:{}",
userIndex + 1, sysOrigin.name()); userIndex + 1, sysOrigin.name());
continue; continue;
@ -486,7 +481,7 @@ public class WeeklyRewardsSentManager {
WeekStarGiftCount user = giftUsers.get(userIndex); WeekStarGiftCount user = giftUsers.get(userIndex);
if (Objects.isNull(user)) { if (Objects.isNull(user)) {
log.warn("周星奖励主动发送:活动礼物{},top{} 用户不存在.系统:{}", resourcesIndex + 1, log.warn("周星奖励主动发送:活动礼物{},top{} 用户不存在.系统:{}", userIndex + 1,
userIndex + 1, sysOrigin.name()); userIndex + 1, sysOrigin.name());
continue; continue;
} }
@ -499,17 +494,17 @@ public class WeeklyRewardsSentManager {
.resourceGroupId(detailedAward.getRule().getResourceGroupId()) .resourceGroupId(detailedAward.getRule().getResourceGroupId())
.origin(SendPropsOrigin.WEEK_STAR) .origin(SendPropsOrigin.WEEK_STAR)
.build()); .build());
log.warn("周星奖励主动发送:活动礼物{},top{} 用户:{} 奖励已发送.系统:{}", resourcesIndex + 1, log.warn("周星奖励主动发送:活动礼物{},top{} 用户:{} 奖励已发送.系统:{}", userIndex + 1,
userIndex + 1, user.getUserId(), sysOrigin.name()); userIndex + 1, user.getUserId(), sysOrigin.name());
} }
}
} }
/** /**
* 获得上周周星礼物. * 获得上周周星礼物.
*/ */
private List<GiftConfigCO> lastWeekStarGift(SysOriginPlatformEnum sysOrigin) { private List<GiftConfigCO> lastWeekStarGift(SysOriginPlatformEnum sysOrigin) {
return weekStarGroupService.getByTypeOne(sysOrigin, WeekStarGiftTypeEnum.LAST_WEEK) return weekStarGroupService.getByTypeOne(sysOrigin, WeekStarGiftTypeEnum.THIS_WEEK)
.map(weekStarGroup -> appGiftConfigMapper.toGiftConfigCO(giftConfigService .map(weekStarGroup -> appGiftConfigMapper.toGiftConfigCO(giftConfigService
.listByIds(weekStarGiftService.listGiftIdsByGroupId(weekStarGroup.getId())))) .listByIds(weekStarGiftService.listGiftIdsByGroupId(weekStarGroup.getId()))))
.orElse(Lists.newArrayList()); .orElse(Lists.newArrayList());