From ae1471f378f399f76518539ec8992e64a3673436 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期三, 08 一月 2025 15:26:06 +0800
Subject: [PATCH] 1.订单提交:订单最小金额配置

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

diff --git a/src/main/java/com/mzl/flower/schedule/PointScheduleService.java b/src/main/java/com/mzl/flower/schedule/PointScheduleService.java
index 9871346..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);
 
                     //更新用户积分记录
@@ -68,7 +68,8 @@
                     if(customerPoint == null ){
                         log.error("用户积分记录不存在,userId={},customerId={}",pointDTO.getUserId(),pointDTO.getCustomerId());
                     }else {
-                        customerPoint.setExpiredPoint(expiredPoint);
+                        Integer expiredPointTotal = customerPoint.getExpiredPoint()==null?0:customerPoint.getExpiredPoint();
+                        customerPoint.setExpiredPoint(expiredPoint+expiredPointTotal);
                         customerPointMapper.updateById(customerPoint);
                     }
 
@@ -84,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