jiazhizhong/OpenIsle
1
0
Fork 0
mirror of https://github.com/nagisa77/OpenIsle.git synced 2026-06-07 02:27:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into codex/fix-finalizelottery-execution-issue

Browse Source
This commit is contained in:
Tim
2025-08-11 10:59:06 +08:00
committed by GitHub
parent 5fa0bd792b 2280a16a83
commit aff3997687
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/main/java/com/openisle/service/PostService.java
View File

@@ -113,7 +113,7 @@ public class PostService {
for (LotteryPost lp : lotteryPostRepository.findByEndTimeAfterAndWinnersIsEmpty(now)) { for (LotteryPost lp : lotteryPostRepository.findByEndTimeAfterAndWinnersIsEmpty(now)) {
ScheduledFuture<?> future = taskScheduler.schedule( ScheduledFuture<?> future = taskScheduler.schedule(
() -> applicationContext.getBean(PostService.class).finalizeLottery(lp.getId()), () -> applicationContext.getBean(PostService.class).finalizeLottery(lp.getId()),
java.util.Date.from(java.sql.Timestamp.valueOf(lp.getEndTime()).toInstant())); java.util.Date.from(java.sql.Timestamp.valueOf(lp.getEndTime()).atZone(java.time.ZoneOffset.UTC).toInstant()));
scheduledFinalizations.put(lp.getId(), future); scheduledFinalizations.put(lp.getId(), future);
} }
for (LotteryPost lp : lotteryPostRepository.findByEndTimeBeforeAndWinnersIsEmpty(now)) { for (LotteryPost lp : lotteryPostRepository.findByEndTimeBeforeAndWinnersIsEmpty(now)) {
@@ -213,7 +213,7 @@ public class PostService {
if (post instanceof LotteryPost lp && lp.getEndTime() != null) { if (post instanceof LotteryPost lp && lp.getEndTime() != null) {
ScheduledFuture<?> future = taskScheduler.schedule( ScheduledFuture<?> future = taskScheduler.schedule(
() -> applicationContext.getBean(PostService.class).finalizeLottery(lp.getId()), () -> applicationContext.getBean(PostService.class).finalizeLottery(lp.getId()),
java.util.Date.from(java.sql.Timestamp.valueOf(lp.getEndTime()).toInstant())); java.util.Date.from(java.sql.Timestamp.valueOf(lp.getEndTime()).atZone(java.time.ZoneOffset.UTC).toInstant()));
scheduledFinalizations.put(lp.getId(), future); scheduledFinalizations.put(lp.getId(), future);
} }
return post; return post;