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

VIP 送金币增加COUPON_EXCHANGE 类型

Browse Source
This commit is contained in:
tianfeng 2025-11-06 21:06:11 +08:00
parent 827741ae36
commit 320d1c3ad6
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -338,12 +338,12 @@ public class DailyTask {
// 分离购买记录和扣除记录
List<RunningWaterUserProps> purchasingRecords = allRecords.stream()
.filter(record -> "PURCHASING_GOLD_PROPS".equals(record.getOrigin()))
.filter(DailyTask::validType)
.collect(Collectors.toList());
// 检查非PURCHASING_GOLD_PROPS类型的扣除天数记录
List<RunningWaterUserProps> deductionRecords = allRecords.stream()
.filter(record -> !"PURCHASING_GOLD_PROPS".equals(record.getOrigin()) && record.getDays() != null && record.getDays() < 0)
.filter(record -> !validType(record) && record.getDays() != null && record.getDays() < 0)
.collect(Collectors.toList());
if (CollectionUtils.isEmpty(purchasingRecords)) {
@ -373,6 +373,10 @@ public class DailyTask {
}
}
private static boolean validType(RunningWaterUserProps record) {
return Arrays.asList("COUPON_EXCHANGE", "PURCHASING_GOLD_PROPS").contains(record.getOrigin());
}
/**
* 计算用户的有效期截止时间
* 根据购买记录和扣除记录，结合时间顺序累计计算有效期