From ad31648c6f7a8bff1f7ccdf84b76006b9ffb78f8 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 17 Jul 2021 15:59:10 +0800
Subject: [PATCH] 1.	新增套餐中有效和无效的操作 2.	会员修改门店功能 3.	套餐新增编辑次数功能 4.	计算是否为赠送的条件为,全部为赠送金额购买且支付金额大于0 5.	打印小票功能调整间距,和收银人 6.	PC端服务单新增划扣金额展示

---
 zq-erp/src/main/java/com/matrix/system/shopXcx/quartz/ShopAutomaticReceiveQuartz.java |    7 ++-----
 1 files changed, 2 insertions(+), 5 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 10df6db..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
@@ -23,9 +23,6 @@
 @Configuration
 public class ShopAutomaticReceiveQuartz {
 
-    @Value("${scheduling.enabled}")
-    private boolean taskSwitch;
-
     @Autowired
     private ShopDeliveryInfoDao shopDeliveryInfoDao;
 
@@ -37,9 +34,9 @@
 
     @Scheduled(cron = "0/30 * * * * ?")
     public void executeExt() {
-        if(taskSwitch) {
 
 
+            LogUtil.info("#15天自动收货任务处理#");
 
             List<ShopDeliveryInfo> shopDeliveryInfos = shopDeliveryInfoDao.selectAutomaticReceive();
             int flag = 0;
@@ -55,7 +52,7 @@
                 }
             }
             LogUtil.info("自动确认收货更新条数:" + flag);
-        }
+
     }
 
 }

--
Gitblit v1.9.1