From dcde5c5a68b94c0841fa70c6e03fe780d0e84993 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 22 Dec 2023 15:15:57 +0800
Subject: [PATCH] 富文本框输入版本变化
---
src/main/java/cc/mrbird/febs/mall/quartz/OrderSettlementJob.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/quartz/OrderSettlementJob.java b/src/main/java/cc/mrbird/febs/mall/quartz/OrderSettlementJob.java
index 34bb490..b876e4a 100644
--- a/src/main/java/cc/mrbird/febs/mall/quartz/OrderSettlementJob.java
+++ b/src/main/java/cc/mrbird/febs/mall/quartz/OrderSettlementJob.java
@@ -17,6 +17,7 @@
import cn.hutool.core.util.ObjectUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@@ -32,6 +33,7 @@
**/
@Slf4j
@Component
+@ConditionalOnProperty(prefix = "system", name = "job", havingValue = "true")
public class OrderSettlementJob {
@Autowired
@@ -103,6 +105,8 @@
* 自动确认收货
*/
@Scheduled(cron = "0 0 0 * * ?")
+
+// @Scheduled(cron = "1 * * * * ?")
public void orderAutoConfirmJob() {
log.info("自动确认收货");
DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.OEDER_AUTO_CONFIRM.getType(), DataDictionaryEnum.OEDER_AUTO_CONFIRM.getCode());
@@ -148,8 +152,8 @@
* 修改业绩的状态
* 并生成一条提成流水
*/
-// @Scheduled(cron = "0 0 1 * * ?")
- @Scheduled(cron = "1 * * * * ?")
+ @Scheduled(cron = "0 0 1 * * ?")
+// @Scheduled(cron = "1 * * * * ?")
public void leaderAchieveAuto() {
log.info("团长每日提成");
//获取每日提成总数
@@ -157,8 +161,8 @@
* a.unique_code uniqueCode 团长特征码
* , IFNULL(sum(a.amount),0) amount 每日提成总金额
*/
-// DateTime dateTime = DateUtil.offsetDay(new Date(), -1);
- DateTime dateTime = DateUtil.offsetDay(new Date(), 0);
+ DateTime dateTime = DateUtil.offsetDay(new Date(), -1);
+// DateTime dateTime = DateUtil.offsetDay(new Date(), 0);
List<Map<String, String>> allLeaderAchieve = mallLeaderAchieveMapper.selectListByStateAndCreateTimeAndUniqueCode(MallLeaderAchieve.STATE_ONE,dateTime);
if (CollUtil.isNotEmpty(allLeaderAchieve)) {
for (Map<String, String> map : allLeaderAchieve) {
--
Gitblit v1.9.1