From 134f5b1aedeb90b9f7a71dc41e8f08e96bcb3f85 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期二, 29 七月 2025 11:46:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
lmk-job/src/main/java/cn/lili/job/ActivityJob.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 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 7d88ea0..601ace7 100644
--- a/lmk-job/src/main/java/cn/lili/job/ActivityJob.java
+++ b/lmk-job/src/main/java/cn/lili/job/ActivityJob.java
@@ -16,6 +16,7 @@
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.stereotype.Component;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -40,10 +41,13 @@
//鑾峰緱鎵�鏈� 娲诲姩
List<Activity> activeActivities = new LambdaQueryChainWrapper<Activity>(activityMapper)
.orderByAsc(Activity::getCreateTime) // 鎸夊垱寤烘椂闂村崌搴�
+ .eq(Activity::getDeleteFlag,Boolean.FALSE)
.list();
Date now = new Date(); // 鑾峰彇褰撳墠鏃堕棿
-
+ List<Activity> newActivities = new ArrayList<>();
for (Activity activity : activeActivities) {
+ String status = activity.getStatus();
+
if (isInProgress(now, activity)) {
activity.setStatus(ActivityStatusEnum.IN_PROGRESS.getType());
} else if (isRecruiting(now, activity)) {
@@ -56,8 +60,13 @@
else {
activity.setStatus(ActivityStatusEnum.ENDED.getType());
}
+ if (status != null && !status.equals(activity.getStatus())) {
+ newActivities.add(activity);
+ }
}
- activityMapper.batchUpdateActivities(activeActivities);
+ if (!newActivities.isEmpty()) {
+ activityMapper.batchUpdateActivities(newActivities);
+ }
// 淇敼
XxlJobHelper.log("鎵ц瀹屾垚锛氭椿鍔ㄧ姸鎬佹敼鍙�");
--
Gitblit v1.8.0