Prechádzať zdrojové kódy

Merge remote-tracking branch 'origin/sit' into uat-20260202

dujian 2 dní pred
rodič
commit
7310834cf8

+ 3 - 2
alien-job/src/main/java/shop/alien/job/store/StoreOperationalActivityJob.java

@@ -54,6 +54,7 @@ public class StoreOperationalActivityJob {
             List<Integer> statusList = new ArrayList<>();
             statusList.add(2); // 未开始
             statusList.add(5); // 进行中
+            statusList.add(6);
             statusList.add(8); // 审核成功
 
             LambdaQueryWrapper<StoreOperationalActivity> queryWrapper = new LambdaQueryWrapper<>();
@@ -91,10 +92,10 @@ public class StoreOperationalActivityJob {
                 if (now.compareTo(endTime) > 0) {
                     // 当前时间 > 结束时间:应该设置为"已结束"(7)
                     // 只处理状态为"未开始"(2)或"进行中"(5)的活动
-                    if (currentStatus == 2 || currentStatus == 5) {
+//                    if (currentStatus == 2 || currentStatus == 5) {
                         endActivityIds.add(activity.getId());
                         log.debug("【定时任务】活动ID: {} 已过期,需要设置为已结束", activity.getId());
-                    }
+//                    }
                 } else if (now.compareTo(startTime) >= 0 && now.compareTo(endTime) <= 0) {
                     // 当前时间在活动时间范围内:应该设置为"进行中"(5)
                     // 只处理状态为"未开始"(2)或"审核成功"(8)的活动