From ba524bc13846fcbedb231b4bebc9a1a0927c5f70 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 30 五月 2025 15:44:15 +0800
Subject: [PATCH] 活动用户登录id可用后整理
---
lmk-job/src/main/java/cn/lili/job/ActivityJob.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/lmk-job/src/main/java/cn/lili/job/ActivityJob.java b/lmk-job/src/main/java/cn/lili/job/ActivityJob.java
index 40f0268..7d88ea0 100644
--- a/lmk-job/src/main/java/cn/lili/job/ActivityJob.java
+++ b/lmk-job/src/main/java/cn/lili/job/ActivityJob.java
@@ -43,16 +43,17 @@
.list();
Date now = new Date(); // 鑾峰彇褰撳墠鏃堕棿
-
-
for (Activity activity : activeActivities) {
if (isInProgress(now, activity)) {
activity.setStatus(ActivityStatusEnum.IN_PROGRESS.getType());
} else if (isRecruiting(now, activity)) {
activity.setStatus(ActivityStatusEnum.REPORT.getType());
- } else if (now.before(activity.getReportStartTime())) {
+ } else if (now.before(activity.getReportStartTime())) { //鍦ㄦ姤鍚嶆椂闂翠箣鍓�
activity.setStatus(ActivityStatusEnum.NOT_STARTED.getType());
- } else {
+ }else if(now.after(activity.getReportEndTime()) && now.before(activity.getStartTime())){ //鍙兘鍑虹幇 鍦ㄦ姤鍚嶇粨鏉熸椂闂村悗锛� 娲诲姩寮�濮嬩箣鍓嶇殑鎯呭喌
+ activity.setStatus(ActivityStatusEnum.NOT_STARTED.getType());
+ }
+ else {
activity.setStatus(ActivityStatusEnum.ENDED.getType());
}
}
@@ -62,11 +63,12 @@
XxlJobHelper.log("鎵ц瀹屾垚锛氭椿鍔ㄧ姸鎬佹敼鍙�");
}
-
+ //娲诲姩寮�濮嬫椂闂翠箣鍚庯紝缁撴潫鏃堕棿涔嬪墠 鍦ㄦ椿鍔ㄦ湡闂�
private boolean isInProgress(Date now, Activity activity) {
+
return !now.before(activity.getStartTime()) && !now.after(activity.getEndTime());
}
-
+ //鍦ㄦ姤鍚嶆湡闂�
private boolean isRecruiting(Date now, Activity activity) {
return !now.before(activity.getReportStartTime()) && !now.after(activity.getReportEndTime());
}
--
Gitblit v1.8.0