From 80d88f15a2222ec2dbe33f5d1d2b2296a890f41b Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 03 三月 2026 16:22:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_admin/src/main/java/com/doumee/task/ScheduleTool.java | 62 ++++++++++++++++++++++++++++--
1 files changed, 57 insertions(+), 5 deletions(-)
diff --git a/server/dmmall_admin/src/main/java/com/doumee/task/ScheduleTool.java b/server/dmmall_admin/src/main/java/com/doumee/task/ScheduleTool.java
index 8b05dec..ef3ba1a 100644
--- a/server/dmmall_admin/src/main/java/com/doumee/task/ScheduleTool.java
+++ b/server/dmmall_admin/src/main/java/com/doumee/task/ScheduleTool.java
@@ -62,6 +62,9 @@
@Autowired
private IntegralService integralService;
+ @Autowired
+ private MemberCouponService memberCouponService;
+
/**
* 鏄惁寮�鍙戣��
*/
@@ -122,9 +125,9 @@
/**
* 瀹氭椂鍙栨秷 鏈敮浠樿鍗曚俊鎭�
*/
-// @Scheduled(fixedDelay = 1000L * 10L )
+ @Scheduled(fixedDelay = 1000L * 10L )
public void cancelGoodsOrder(){
- goodsorderService.autoCancel();
+ goodsorderService.autoCancelOrder();
}
/**
@@ -152,9 +155,23 @@
activitySignService.autoCancelSign();
}
-
-
-
+ /**
+ * 瀹氭椂閫氱煡鐢ㄦ埛浼樻儬鍒稿嵆灏嗚繃鏈�
+ * 姣忓ぉ鏃╀笂 9 鐐规墽琛岋紝閫氱煡 7 澶╁唴鍗冲皢杩囨湡鐨勪紭鎯犲埜
+ */
+ @Scheduled(cron = "0 0 9 * * ?")
+ public void notifyCouponExpired() {
+ if (timing) {
+ System.out.println("寮�濮嬫墽琛屼紭鎯犲埜杩囨湡閫氱煡浠诲姟--------Begin------");
+ try {
+ // 鎻愬墠 3 澶╅�氱煡
+ memberCouponService.notifyExpiredCoupon(7);
+ System.out.println("浼樻儬鍒歌繃鏈熼�氱煡浠诲姟鎵ц鎴愬姛--------End------");
+ } catch (Exception e) {
+ System.out.println("浼樻儬鍒歌繃鏈熼�氱煡浠诲姟鎵ц澶辫触锛�" + e.getMessage());
+ }
+ }
+ }
/**
* 鍙戦�乬et璇锋眰
@@ -258,4 +275,39 @@
}
}
+ /**
+ * 瀹氭椂澶勭悊绉垎杩囨湡
+ * 姣忓ぉ鍑屾櫒 2 鐐规墽琛�
+ */
+ @Scheduled(cron = "0 0 2 1 * ?")
+ public void autoExpiredIntegral() {
+ if (timing) {
+ System.out.println("寮�濮嬫墽琛岀Н鍒嗚繃鏈熷鐞嗕换鍔�--------Begin------");
+ try {
+ integralService.expiredIntegral();
+ System.out.println("绉垎杩囨湡澶勭悊浠诲姟鎵ц鎴愬姛--------End------");
+ } catch (Exception e) {
+ System.out.println("绉垎杩囨湡澶勭悊浠诲姟鎵ц澶辫触锛�" + e.getMessage());
+ }
+ }
+ }
+
+
+ /**
+ * 瀹氭椂鍙戦�佺Н鍒嗗嵆灏嗚繃鏈熼�氱煡
+ * 姣忓ぉ鍑屾櫒 2 鐐规墽琛�
+ */
+ @Scheduled(cron = "0 0 2 25 * ?")
+ public void autoExpiredIntegralNotice() {
+ if (timing) {
+ System.out.println("寮�濮嬫墽琛岀Н鍒嗗嵆灏嗚繃鏈熼�氱煡澶勭悊浠诲姟--------Begin------");
+ try {
+ integralService.expiredIntegralNotice();
+ System.out.println("绉垎鍗冲皢杩囨湡閫氱煡澶勭悊浠诲姟鎵ц鎴愬姛--------End------");
+ } catch (Exception e) {
+ System.out.println("绉垎鍗冲皢杩囨湡閫氱煡澶勭悊浠诲姟鎵ц澶辫触锛�" + e.getMessage());
+ }
+ }
+ }
+
}
--
Gitblit v1.9.3