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/ShopActivityGroupJoinTimeOutQuartz.java | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/quartz/ShopActivityGroupJoinTimeOutQuartz.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/quartz/ShopActivityGroupJoinTimeOutQuartz.java index 4c1efc7..fd0d99e 100644 --- a/zq-erp/src/main/java/com/matrix/system/shopXcx/quartz/ShopActivityGroupJoinTimeOutQuartz.java +++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/quartz/ShopActivityGroupJoinTimeOutQuartz.java @@ -8,7 +8,6 @@ import com.matrix.system.shopXcx.dao.ShopActivitiesDao; import com.matrix.system.shopXcx.dao.ShopActivitiesGroupJoinDao; 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; @@ -28,13 +27,11 @@ @Autowired private ShopActivitiesDao shopActivitiesDao ; - @Value("${scheduling.enabled}") - private boolean taskSwitch; + @Scheduled(cron = "0 */1 * * * ?") public boolean executeExt() { - if (taskSwitch) { LogUtil.info("#开团时间超时任务处理#"); List<ShopActivitiesGroupJoin> groupJoins = shopActivitiesGroupJoinDao.selectGroupJoinWithEnd(); ShopActivityTimeOutQuartz timeOutQuartz = new ShopActivityTimeOutQuartz(); @@ -48,7 +45,6 @@ timeOutQuartz.doUnVirtualGroup(groupJoin); } } - } } return true; } -- Gitblit v1.9.1