From af6456c60aa0d3cc931d3c85f652fa7e47d003e3 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 23 六月 2025 11:11:02 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0

---
 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/scheduler/MemberScheduler.java |   46 ++++++++++++++++++++++++++++++++++++----------
 1 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/scheduler/MemberScheduler.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/scheduler/MemberScheduler.java
index 609417f..73d6b36 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/scheduler/MemberScheduler.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/scheduler/MemberScheduler.java
@@ -3,8 +3,9 @@
 
 import com.ruoyi.member.service.coupon.CouponService;
 import com.ruoyi.member.service.member.MemberCouponService;
+import com.ruoyi.member.service.member.MemberService;
 import com.ruoyi.member.service.member.MemberTotalService;
-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;
@@ -13,7 +14,7 @@
 
 
 @Component
-@Slf4j
+@Log4j2
 public class MemberScheduler {
 
 
@@ -29,33 +30,58 @@
     @Resource
     private MemberTotalService memberTotalService;
 
+    @Resource
+    private MemberService memberService;
+
     /**
-     * 优惠券定时发送
+     * 每小时优惠券定时发送
      */
-    @Scheduled(cron="0 */1 * * * ?")
+    @Scheduled(cron="0 0 */1 * * ?")
     private void timingSendCoupon(){
         if(schedulerUtils.getSchedulerRun()) {
-            log.info("优惠券定时发放任务开始执行");
+            log.info("----------------优惠券定时发放任务开始执行-------------");
             couponService.timingSendCoupon();
         }
     }
 
     /**
-     * 定时检查优惠券过期
+     * 每天凌晨定时检查优惠券过期
      */
-    @Scheduled(cron="0 0 * * * ?")
+    @Scheduled(cron="1 0 0 * * ?")
     private void timingCheckMemberCoupon(){
         if(schedulerUtils.getSchedulerRun()) {
-            log.info("定时检查优惠券过期任务开始执行");
+            log.info("----------------定时检查优惠券过期任务开始执行----------------");
             memberCouponService.timingCheckMemberCoupon();
         }
     }
 
-    @Scheduled(cron="3 0 * * * ?")
+    /**
+     * @description  每天凌晨定时更新用户每日任务
+     * @author  jqs
+     * @date    2023/8/30 11:39
+     * @param 
+     * @return  void
+     */
+    @Scheduled(cron="10 0 0 * * ?")
     private void timinginitIntegralFlag(){
         if(schedulerUtils.getSchedulerRun()) {
-            log.info("定时更新用户每日任务标记");
+            log.info("----------------定时更新用户每日任务标记开始执行----------------");
             memberTotalService.initIntegralFlag();
         }
     }
+
+    /**
+     * @description  早上10点发送生日祝福
+     * @author  jqs
+     * @date    2023/8/30 11:38
+     * @param 
+     * @return  void
+     */
+    @Scheduled(cron="0 0 10 * * ?")
+    private void timingSendBirthdayBless(){
+        if(schedulerUtils.getSchedulerRun()) {
+            log.info("----------------定时发送生日祝福开始执行----------------");
+            memberService.sendBirthdayBless();
+        }
+    }
 }

--
Gitblit v1.7.1