From 49726442d0bad78c9211b7ea13d688c03b916ff6 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期二, 03 九月 2024 17:40:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/java/com/mzl/flower/schedule/ScheduleService.java | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/mzl/flower/schedule/ScheduleService.java b/src/main/java/com/mzl/flower/schedule/ScheduleService.java
index 75f9e07..1cf21b0 100644
--- a/src/main/java/com/mzl/flower/schedule/ScheduleService.java
+++ b/src/main/java/com/mzl/flower/schedule/ScheduleService.java
@@ -12,12 +12,14 @@
import com.mzl.flower.service.coupon.CouponRecordService;
import com.mzl.flower.service.flower.FlowerCategoryService;
import com.mzl.flower.service.flower.FlowerService;
+import com.mzl.flower.service.menber.impl.GrowthValueDealService;
import com.mzl.flower.service.payment.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
import java.time.LocalDate;
import java.time.LocalDateTime;
@@ -57,6 +59,9 @@
@Autowired
private OrderItemSettlementService orderItemSettlementService;
+
+ @Autowired
+ private GrowthValueDealService growthValueDealService;
@Autowired
private CouponRecordService couponRecordService;
@@ -190,6 +195,26 @@
log.info("账单结束：" + DateFormatUtils.format(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss"));
}
+ //成长值降级定时任务
+ @Scheduled(cron = "0 0 5 * * ?")
+ public void deductGrowthValue() {
+ log.info("成长值扣除开始：" + DateFormatUtils.format(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss"));
+ //获取当前员工
+ List<Order> orderList = orderMapper.getOrderInfoByReceiveTime();
+ if(!CollectionUtils.isEmpty(orderList)){
+ orderList.forEach(o->{
+ try {
+ growthValueDealService.deductionGrowthValue(o);
+ } catch (Exception e) {
+ // 记录错误信息，例如将错误信息写入日志
+ log.info("处理订单 " + o.getId() + " 时出错： " + e.getMessage());
+ }
+ });
+ }
+ log.info("成长值扣除结束：" + DateFormatUtils.format(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss"));
+ }
+
+
@Scheduled(cron = "0 30 0 1 * ?")
public void grantVipCouponRecordList() {
log.info("会员优惠券开始：" + DateFormatUtils.format(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss"));
@@ -198,10 +223,11 @@
}
@Scheduled(cron = "0 30 0 1 * ?")
- public void expiredVipCouponRecordList() {
- log.info("会员优惠券过期开始：" + DateFormatUtils.format(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss"));
- couponRecordService.expiredCouponRecordByListCurMonth();
- log.info("会员优惠券过期结束：" + DateFormatUtils.format(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss"));
+ public void expiredCouponRecordLastMon() {
+ log.info("会员优惠券开始：" + DateFormatUtils.format(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss"));
+ couponRecordService.expiredCouponRecordLastMon();
+ log.info("会员优惠券结束：" + DateFormatUtils.format(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss"));
}
+
}
--
Gitblit v1.9.3