From d85af61932a03bd03663daf9da33177af5824a5c Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 20 Apr 2021 14:09:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger
---
zq-erp/src/main/java/com/matrix/system/shopXcx/quartz/ShopAutomaticReceiveQuartz.java | 11 ++---------
1 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/quartz/ShopAutomaticReceiveQuartz.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/quartz/ShopAutomaticReceiveQuartz.java
index bcf6a1a..a842add 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/quartz/ShopAutomaticReceiveQuartz.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/quartz/ShopAutomaticReceiveQuartz.java
@@ -1,18 +1,15 @@
package com.matrix.system.shopXcx.quartz;
import com.matrix.core.tools.LogUtil;
-import com.matrix.core.tools.WebUtil;
import com.matrix.system.shopXcx.api.tools.WxShopOrderUtil;
import com.matrix.system.shopXcx.bean.ShopDeliveryInfo;
import com.matrix.system.shopXcx.bean.ShopOrder;
import com.matrix.system.shopXcx.dao.ShopDeliveryInfoDao;
import com.matrix.system.shopXcx.dao.ShopOrderDao;
import org.apache.commons.collections.CollectionUtils;
-
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
import java.util.HashMap;
@@ -24,11 +21,7 @@
* 15天自动确认收货定时任务
*/
@Configuration
-@EnableScheduling
public class ShopAutomaticReceiveQuartz {
-
- @Value("${scheduling.enabled}")
- private boolean taskSwitch;
@Autowired
private ShopDeliveryInfoDao shopDeliveryInfoDao;
@@ -41,9 +34,9 @@
@Scheduled(cron = "0/30 * * * * ?")
public void executeExt() {
- if(taskSwitch) {
+ LogUtil.info("#15天自动收货任务处理#");
List<ShopDeliveryInfo> shopDeliveryInfos = shopDeliveryInfoDao.selectAutomaticReceive();
int flag = 0;
@@ -59,7 +52,7 @@
}
}
LogUtil.info("自动确认收货更新条数：" + flag);
- }
+
}
}
--
Gitblit v1.9.1