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

贵族每日金币兼容COUPON方式

Browse Source
This commit is contained in:
tianfeng 2025-11-13 11:35:05 +08:00
parent fdbef21d26
commit f2a73010b4
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/scheduler/DailyTask.java
View File

@ -241,7 +241,8 @@ public class DailyTask {
List<Long> processedUsers = Lists.newArrayList(); // 记录已处理的用户，避免重复发放 List<Long> processedUsers = Lists.newArrayList(); // 记录已处理的用户，避免重复发放
commodityList.forEach(propsStoreCommodity -> { commodityList.forEach(propsStoreCommodity -> {
List<PropsBackpack> propsBackpackList = propsBackpackService.listUsersByNobleVipAndPropsId(PropsCommodityType.NOBLE_VIP, propsStoreCommodity.getPropsResources().getId()); Long propsId = propsStoreCommodity.getPropsResources().getId();
List<PropsBackpack> propsBackpackList = propsBackpackService.listUsersByNobleVipAndPropsId(PropsCommodityType.NOBLE_VIP, propsId);
log.info("VIP用户: {}", JSON.toJSONString(propsBackpackList)); log.info("VIP用户: {}", JSON.toJSONString(propsBackpackList));
// 提取用户ID列表 // 提取用户ID列表
@ -251,7 +252,7 @@ public class DailyTask {
.collect(Collectors.toList()); .collect(Collectors.toList());
// 查询用户是否处于可赠送金币区间 // 查询用户是否处于可赠送金币区间
List<Long> eligibleUsers = getEligibleGiftUsers(allUsers); List<Long> eligibleUsers = getEligibleGiftUsers(allUsers, propsId);
// 给每个用户发送奖励，排除已处理的用户 // 给每个用户发送奖励，排除已处理的用户
for (Long userId : eligibleUsers) { for (Long userId : eligibleUsers) {
@ -301,7 +302,7 @@ public class DailyTask {
* 2. 如果当前时间在范围内则为有效赠送用户 * 2. 如果当前时间在范围内则为有效赠送用户
* 3. 如果没有PURCHASING_GOLD_PROPS类型，则其余不赠送 * 3. 如果没有PURCHASING_GOLD_PROPS类型，则其余不赠送
*/ */
private List<Long> getEligibleGiftUsers(List<Long> allUsers) { private List<Long> getEligibleGiftUsers(List<Long> allUsers, Long propsId) {
if (CollectionUtils.isEmpty(allUsers)) { if (CollectionUtils.isEmpty(allUsers)) {
return Lists.newArrayList(); return Lists.newArrayList();
} }
@ -310,7 +311,7 @@ public class DailyTask {
LocalDateTime now = LocalDateTime.now(); LocalDateTime now = LocalDateTime.now();
for (Long userId : allUsers) { for (Long userId : allUsers) {
if (isUserEligibleForGift(userId, now)) { if (isUserEligibleForGift(userId, now, propsId)) {
eligibleUsers.add(userId); eligibleUsers.add(userId);
} }
} }
@ -322,11 +323,12 @@ public class DailyTask {
/** /**
* 判断单个用户是否符合赠送条件 * 判断单个用户是否符合赠送条件
*/ */
private boolean isUserEligibleForGift(Long userId, LocalDateTime currentTime) { private boolean isUserEligibleForGift(Long userId, LocalDateTime currentTime, Long propsId) {
try { try {
// 查询用户NOBLE_VIP类型的所有流水记录 // 查询用户NOBLE_VIP类型的所有流水记录
List<RunningWaterUserProps> allRecords = runningWaterUserPropsService.query() List<RunningWaterUserProps> allRecords = runningWaterUserPropsService.query()
.eq(RunningWaterUserProps::getUserId, userId) .eq(RunningWaterUserProps::getUserId, userId)
.eq(RunningWaterUserProps::getPropsId, propsId)
.eq(RunningWaterUserProps::getType, "NOBLE_VIP") .eq(RunningWaterUserProps::getType, "NOBLE_VIP")
.orderByAsc(RunningWaterUserProps::getCreateTime) .orderByAsc(RunningWaterUserProps::getCreateTime)
.list(); .list();

1
rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/props/impl/PropsBackpackServiceImpl.java
View File

@ -412,7 +412,6 @@ public class PropsBackpackServiceImpl extends
return query() return query()
.eq(PropsBackpack::getType, propsType) .eq(PropsBackpack::getType, propsType)
.eq(PropsBackpack::getPropsId, propsId) .eq(PropsBackpack::getPropsId, propsId)
.eq(PropsBackpack::getUseProps, Boolean.TRUE)
.gt(PropsBackpack::getExpireTime, TimestampUtils.now()) .gt(PropsBackpack::getExpireTime, TimestampUtils.now())
.list() .list()
.stream() .stream()