From beb6e85c9b054e8edced241c3367814a0a19d70c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 07 Apr 2021 11:42:38 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop

---
 zq-erp/src/main/java/com/matrix/system/shopXcx/quartz/ShopActivityPayTimeOutQuartz.java |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/quartz/ShopActivityPayTimeOutQuartz.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/quartz/ShopActivityPayTimeOutQuartz.java
index 8a2d9b3..3f85cd5 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/quartz/ShopActivityPayTimeOutQuartz.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/quartz/ShopActivityPayTimeOutQuartz.java
@@ -9,7 +9,6 @@
 import com.matrix.system.shopXcx.dao.ShopActivitiesGroupJoinUserDao;
 import com.matrix.system.shopXcx.dao.ShopOrderDao;
 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.Scheduled;
 
@@ -32,13 +31,11 @@
     @Autowired
     private ShopActivitiesGroupJoinDao shopActivitiesGroupJoinDao;
 
-    @Value("${scheduling.enabled}")
-    private boolean taskSwitch;
 
 
     @Scheduled(cron = "0 */1 * * * ?")
     public void executeExt() {
-        if (taskSwitch) {
+
             LogUtil.info("#拼团支付超时处理任务#");
             List<ShopActivitiesGroupJoinUser> joinUserList = shopActivitiesGroupJoinUserDao.selectGroupJoinUserEnd();
             if (CollectionUtils.isNotEmpty(joinUserList)) {
@@ -59,7 +56,7 @@
                     shopOrder.setOrderStatus(ShopOrder.ORDER_STATUS_CANCEL);
                     shopOrderDao.updateByModel(shopOrder);
                 }
-            }
+
         }
     }
 }

--
Gitblit v1.9.1