From 1fe9a1c594c40324b64f2822b2381e741fa231fc Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期四, 09 一月 2025 09:00:45 +0800
Subject: [PATCH] 1.花材报表-把下架和强制下架状态分开

---
 src/main/java/com/mzl/flower/schedule/WarehouseScheduleService.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/mzl/flower/schedule/WarehouseScheduleService.java b/src/main/java/com/mzl/flower/schedule/WarehouseScheduleService.java
index 999763e..e50cecb 100644
--- a/src/main/java/com/mzl/flower/schedule/WarehouseScheduleService.java
+++ b/src/main/java/com/mzl/flower/schedule/WarehouseScheduleService.java
@@ -85,8 +85,8 @@
                         }
                     }
                     if(customerOrders!=null && customerOrders.size()>0){ //散户订单
+                        Map<String, WarehouseLocationDTO> customerLocationMap = new HashMap<>();
                         for (Order order : customerOrders) {
-                            Map<String, WarehouseLocationDTO> customerLocationMap = new HashMap<>();
                             if(locations!=null && locations.size()>0){
                                 String key = order.getCreateBy()+"||"+order.getCustomerAddress();
                                 WarehouseLocationDTO location = null;
@@ -110,7 +110,7 @@
     /**
      * 每天凌晨2点,合伙人发货
      */
-    @Scheduled(cron = "0 0 2 * * ?")
+    @Scheduled(cron = "0 0 6 * * ?")
     public void clearWarehouseLocation() {
         log.info("定时合伙人发货开始:" + DateFormatUtils.format(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss"));
         orderService.setPartnerOrderSend();

--
Gitblit v1.9.3