From 0d5ce03a7e150d034fadc7f864ee659cf4c6150f Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 08 八月 2025 17:23:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
lmk-job/src/main/java/cn/lili/handler/impl/order/OrderEveryDayTaskExecute.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/lmk-job/src/main/java/cn/lili/handler/impl/order/OrderEveryDayTaskExecute.java b/lmk-job/src/main/java/cn/lili/handler/impl/order/OrderEveryDayTaskExecute.java
index 40a1d6b..85a590a 100644
--- a/lmk-job/src/main/java/cn/lili/handler/impl/order/OrderEveryDayTaskExecute.java
+++ b/lmk-job/src/main/java/cn/lili/handler/impl/order/OrderEveryDayTaskExecute.java
@@ -89,7 +89,6 @@
*/
@Override
public void execute() {
-
Setting setting = settingService.get(SettingEnum.ORDER_SETTING.name());
//璁㈠崟璁剧疆
OrderSetting orderSetting = JSONUtil.toBean(setting.getSettingValue(), OrderSetting.class);
@@ -269,7 +268,9 @@
int day = DateUtil.date().dayOfMonth();
//鑾峰彇寰呯粨绠楀晢瀹跺垪琛�
- List<StoreSettlementDay> storeList = storeDetailService.getSettlementStore(day);
+// List<StoreSettlementDay> storeList = storeDetailService.getSettlementStore(day);
+ //鐩存帴浠庢墍鏈夊晢瀹朵腑鍘荤粨绠椾笉鍦ㄦ牴鎹ぉ鏁板幓缁撶畻
+ List<StoreSettlementDay> storeList = storeDetailService.getAllSettlementStore();
//鑾峰彇褰撳墠鏃堕棿
DateTime endTime = DateUtil.date();
--
Gitblit v1.8.0