From 28476cb34302adfc1290894d1e5567377549cf0b Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Thu, 16 Oct 2025 10:40:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=BB=A1=E5=87=8F=E6=B4=BB=E5=8A=A8=E5=AE=9A?=
 =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/czg/task/AAMarketTasks.java | 46 +++++++++++++++++++
 .../java/com/czg/task/BirthdayGiftTask.java   |  2 +-
 .../main/java/com/czg/task/CouponTask.java    |  4 +-
 .../com/czg/task/DiscountActivityTask.java    | 38 +++++++++++++++
 .../main/java/com/czg/task/MemberTask.java    |  4 +-
 5 files changed, 89 insertions(+), 5 deletions(-)
 create mode 100644 cash-api/market-server/src/main/java/com/czg/task/AAMarketTasks.java
 create mode 100644 cash-api/market-server/src/main/java/com/czg/task/DiscountActivityTask.java

diff --git a/cash-api/market-server/src/main/java/com/czg/task/AAMarketTasks.java b/cash-api/market-server/src/main/java/com/czg/task/AAMarketTasks.java
new file mode 100644
index 00000000..a0d2e65f
--- /dev/null
+++ b/cash-api/market-server/src/main/java/com/czg/task/AAMarketTasks.java
@@ -0,0 +1,46 @@
+package com.czg.task;
+
+import jakarta.annotation.Resource;
+import org.springframework.scheduling.annotation.Scheduled;
+
+/**
+ * market服务 任务总调度
+ * @author ww
+ * @description
+ */
+public class AAMarketTasks {
+    //生日有礼奖励发放
+    @Resource
+    private BirthdayGiftTask birthdayGiftTask;
+    @Scheduled(cron = "0 0 12 * * ?")
+    public void birthdayGiftTask() {
+        birthdayGiftTask.deliver();
+    }
+
+
+    //优惠券 过期
+    @Resource
+    private CouponTask couponTask;
+    @Scheduled(cron = "0 30 * * * ? ")
+    public void couponTask() {
+        couponTask.task();
+    }
+
+    //会员奖励发放
+    @Resource
+    private MemberTask memberTask;
+    @Scheduled(cron = "0 0 1 * * ? ")
+    public void memberTask() {
+        memberTask.task();
+    }
+
+    //满减活动定时任务
+    @Resource
+    private DiscountActivityTask discountActivityTask;
+    @Scheduled(cron = "1 0 0 * * ? ")
+    public void discountActivityTask() {
+        discountActivityTask.task();
+    }
+
+
+}
diff --git a/cash-api/market-server/src/main/java/com/czg/task/BirthdayGiftTask.java b/cash-api/market-server/src/main/java/com/czg/task/BirthdayGiftTask.java
index 2e51a25d..3b5c6d5a 100644
--- a/cash-api/market-server/src/main/java/com/czg/task/BirthdayGiftTask.java
+++ b/cash-api/market-server/src/main/java/com/czg/task/BirthdayGiftTask.java
@@ -31,7 +31,7 @@ public class BirthdayGiftTask {
     /**
      * 生日有礼奖励发放
      */
-    @Scheduled(cron = "0 0 12 * * ?")
+//    @Scheduled(cron = "0 0 12 * * ?")
     public void deliver() {
         birthdayGiftService.deliver();
     }
diff --git a/cash-api/market-server/src/main/java/com/czg/task/CouponTask.java b/cash-api/market-server/src/main/java/com/czg/task/CouponTask.java
index 5ff7021b..c5249e63 100644
--- a/cash-api/market-server/src/main/java/com/czg/task/CouponTask.java
+++ b/cash-api/market-server/src/main/java/com/czg/task/CouponTask.java
@@ -31,8 +31,8 @@ public class CouponTask {
     /**
      * 优惠券 过期
      */
-    @Scheduled(cron = "0 30 * * * ? ")
-    public void deliver() {
+//    @Scheduled(cron = "0 30 * * * ? ")
+    public void task() {
         try {
             LocalDateTime now = LocalDateTime.now();
             mkShopCouponRecordService.update(new MkShopCouponRecord().setStatus(2), new QueryWrapper()
diff --git a/cash-api/market-server/src/main/java/com/czg/task/DiscountActivityTask.java b/cash-api/market-server/src/main/java/com/czg/task/DiscountActivityTask.java
new file mode 100644
index 00000000..1d6254b4
--- /dev/null
+++ b/cash-api/market-server/src/main/java/com/czg/task/DiscountActivityTask.java
@@ -0,0 +1,38 @@
+package com.czg.task;
+
+import com.czg.market.entity.MkDiscountActivity;
+import com.czg.market.service.MkDiscountActivityService;
+import com.mybatisflex.core.query.QueryWrapper;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+
+/**
+ * 满减活动定时任务
+ *
+ * @author ww
+ * @description
+ */
+@Slf4j
+@Component
+public class DiscountActivityTask {
+    @Resource
+    private MkDiscountActivityService discountActivityService;
+
+    /**
+     * 满减活动 过期
+     */
+    public void task() {
+        discountActivityService.update(new MkDiscountActivity().setStatus(2),
+                new QueryWrapper()
+                        .eq(MkDiscountActivity::getStatus, 1)
+                        .le(MkDiscountActivity::getValidStartTime, LocalDateTime.now())
+                        .gt(MkDiscountActivity::getValidEndTime, LocalDateTime.now())
+        );
+        discountActivityService.update(new MkDiscountActivity().setStatus(3),
+                new QueryWrapper().le(MkDiscountActivity::getValidEndTime, LocalDateTime.now())
+        );
+    }
+}
diff --git a/cash-api/market-server/src/main/java/com/czg/task/MemberTask.java b/cash-api/market-server/src/main/java/com/czg/task/MemberTask.java
index 9f738a7b..83a40f26 100644
--- a/cash-api/market-server/src/main/java/com/czg/task/MemberTask.java
+++ b/cash-api/market-server/src/main/java/com/czg/task/MemberTask.java
@@ -37,8 +37,8 @@ public class MemberTask {
     /**
      * 奖励发放
      */
-    @Scheduled(cron = "0 0 1 * * ? ")
-    public void deliver() {
+//    @Scheduled(cron = "0 0 1 * * ? ")
+    public void task() {
         shopUserService.list(new QueryWrapper().eq(ShopUser::getIsVip, 1).lt(ShopUser::getNextDeliverTime, DateUtil.date().toLocalDateTime())).forEach(item -> {
             memberConfigService.deliver(item.getSourceShopId(), item.getUserId(), TableValueConstant.MemberExpFlow.Type.MEMBER_TASK, null, null, null);
         });