From 24e21f8ce1a28a78a58f9a95cc6438b4a9c737a6 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期六, 12 十月 2024 11:09:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2

---
 src/main/java/com/mzl/flower/schedule/PointScheduleService.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/mzl/flower/schedule/PointScheduleService.java b/src/main/java/com/mzl/flower/schedule/PointScheduleService.java
index 3a046c1..bbbc0bd 100644
--- a/src/main/java/com/mzl/flower/schedule/PointScheduleService.java
+++ b/src/main/java/com/mzl/flower/schedule/PointScheduleService.java
@@ -40,7 +40,7 @@
     /**
      * 定时计算用户过期积分
      */
-    @Scheduled(cron = "0 10 1 * * ?")
+    @Scheduled(cron = "0 10 0 * * ?")
     public void calculatingExpiredPoint() {
         log.info("过期积分计算开始:" + DateFormatUtils.format(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss"));
         LocalDate now = LocalDate.now().minusDays(1);//前一天
@@ -58,7 +58,7 @@
                     customerPointDetail.setPoint(expiredPoint);
                     customerPointDetail.setRecordDate(lastYear);
                     customerPointDetail.create("sys");
-                    customerPointDetail.setRemarks(DateUtils.toString(now,"yyyy-MM-dd")+"过期积分结算");
+                    customerPointDetail.setRemarks(DateUtils.toString(now,"yyyy-MM-dd")+"过期积分结算,过期积分"+expiredPoint);
                     customerPointDetailMapper.insert(customerPointDetail);
 
                     //更新用户积分记录
@@ -85,7 +85,7 @@
     /**
      * 积分兑换券过期
      */
-    @Scheduled(cron = "0 46 11 * * ?")
+    @Scheduled(cron = "0 5 0 * * ?")
     public void expiredPointGoodsRecord() {
         log.info("积分兑换券过期计算开始:" + DateFormatUtils.format(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss"));
         pointGoodsRecordMapper.updateExpiredPointGoodsRecord();

--
Gitblit v1.9.3