From f6137d2b84e7249548b2efd8d32db6e814eef3d2 Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <cuizf@fengyuntec.com>
Date: 星期五, 13 九月 2024 18:58:20 +0800
Subject: [PATCH] 打印价格计算 双倍bug
---
src/main/java/com/mzl/flower/schedule/WarehouseScheduleService.java | 2 +-
src/main/java/com/mzl/flower/service/payment/OrderService.java | 3 ++-
2 files changed, 3 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 d7434a4..8689b36 100644
--- a/src/main/java/com/mzl/flower/schedule/WarehouseScheduleService.java
+++ b/src/main/java/com/mzl/flower/schedule/WarehouseScheduleService.java
@@ -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();
diff --git a/src/main/java/com/mzl/flower/service/payment/OrderService.java b/src/main/java/com/mzl/flower/service/payment/OrderService.java
index 2b879a2..2ef01ff 100644
--- a/src/main/java/com/mzl/flower/service/payment/OrderService.java
+++ b/src/main/java/com/mzl/flower/service/payment/OrderService.java
@@ -928,8 +928,9 @@
if(llc == null){
llc = new OrderCheckLocationListDTO();
BeanUtils.copyProperties(c, llc);
- rMap.put(locationId, llc);
+ llc.setTotalAmount(new BigDecimal(0));
+ rMap.put(locationId, llc);
result.add(llc);
}
--
Gitblit v1.9.3