From 263bb9ea9b2083bfe5b4df666c64336618876d72 Mon Sep 17 00:00:00 2001 From: wangshuai Date: Wed, 10 Jul 2024 23:31:16 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E9=85=8D=E9=80=81-ai=E8=B0=83?= =?UTF-8?q?=E7=94=A8=E8=A7=84=E5=88=99=20=20=E5=BE=85=E7=BB=AD=20=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/quartz/task/RyTask.java | 9 ++++- ruoyi-ui/src/views/market/self/index.vue | 34 +++++++++---------- ruoyi-ui/src/views/market/whole/index.vue | 30 ++++++++-------- ruoyi-ui/src/views/statistics/shop/index.vue | 30 ++++++++-------- 4 files changed, 55 insertions(+), 48 deletions(-) diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java index ad50a83..5b42559 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java @@ -11,6 +11,7 @@ import java.time.LocalDateTime; import java.time.LocalTime; import java.time.ZoneId; import java.time.format.DateTimeFormatter; +import java.util.ArrayList; import java.util.List; /** @@ -151,7 +152,13 @@ public class RyTask { } } else continue; // 配置规则 - List list = orderInfoService.selectBusOrderInfoListToAi(busStoreInfo.getStoreCode(),t1, t2); + List list = new ArrayList<>(); + if("1".equals(busStoreInfo.getSelfDeliveryStatus())){ + list = orderInfoService.selectBusOrderInfoListToAi(busStoreInfo.getStoreCode(),t1, t2); + }else if("2".equals(busStoreInfo.getSelfDeliveryStatus())){ + // 自配送前推时间处理 + list = orderInfoService.selectBusOrderInfoListToAi(busStoreInfo.getStoreCode(),t1, t2); + } // list.forEach(System.out::println); BusStoreConfigInfo busStoreConfigInfo = new BusStoreConfigInfo(); busStoreConfigInfo.setStoreCode(busStoreInfo.getStoreCode()); diff --git a/ruoyi-ui/src/views/market/self/index.vue b/ruoyi-ui/src/views/market/self/index.vue index 36e772e..0803ae0 100644 --- a/ruoyi-ui/src/views/market/self/index.vue +++ b/ruoyi-ui/src/views/market/self/index.vue @@ -146,33 +146,33 @@ - + - - - + + + - - - - - - - - - + + + + + + + + + - - + +