From c5d38d650d2ac4101b1293a4f17346e7d5420076 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 04 七月 2025 20:39:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/scheduler/ShopScheduler.java | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/scheduler/ShopScheduler.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/scheduler/ShopScheduler.java
index b239586..c148a91 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/scheduler/ShopScheduler.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/scheduler/ShopScheduler.java
@@ -1,8 +1,9 @@
package com.ruoyi.shop.scheduler;
+import com.ruoyi.shop.service.shop.ShopService;
import com.ruoyi.shop.service.task.ShopTaskService;
-import lombok.extern.slf4j.Slf4j;
+import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@@ -11,7 +12,7 @@
@Component
-@Slf4j
+@Log4j2
public class ShopScheduler {
@@ -21,16 +22,32 @@
@Resource
private ShopTaskService shopTaskService;
+ @Resource
+ private ShopService shopService;
+
/**
- * 定时检查跟进任务状态
+ * 每天凌晨定时检查今日跟进任务状态
*/
- @Scheduled(cron="5 0 * * * ?")
+ @Scheduled(cron="0 1 0 * * ?")
private void timingCheckMemberCoupon(){
if(schedulerUtils.getSchedulerRun()) {
- log.info("定时检查跟进任务状态任务开始执行");
+ log.info("--------------------定时检查跟进任务状态任务开始执行--------------------");
shopTaskService.checkTaskDateStatus();
+ log.info("--------------------定时检查跟进任务状态任务结束执行--------------------");
}
}
+ /**
+ *
+ * 定时检查 每30分钟检查一次 微信二级商户进件状态
+ */
+ @Scheduled(cron="0 0/15 * * * ?")
+ private void queryEcommerceApplyMentsStatus(){
+ if(schedulerUtils.getSchedulerRun()) {
+ log.info("--------------------定时检查微信二级商户进件状态任务开始执行--------------------");
+ shopService.queryEcommerceApplyMentsStatus();
+ log.info("--------------------定时检查微信二级商户进件状态任务结束执行--------------------");
+ }
+ }
}
--
Gitblit v1.7.1