From e468d0b56e1c33f047bee84ca8c9a142c769fe16 Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期四, 26 九月 2024 13:12:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
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..8689b36 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 4 * * ?")
public void clearWarehouseLocation() {
log.info("定时合伙人发货开始：" + DateFormatUtils.format(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss"));
orderService.setPartnerOrderSend();
--
Gitblit v1.9.3