From 10215da99ee763cf72897c747f82efd4f9a513ad Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期四, 12 九月 2024 20:32:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/java/com/mzl/flower/service/payment/OrderService.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
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 75a5177..54c79fb 100644
--- a/src/main/java/com/mzl/flower/service/payment/OrderService.java
+++ b/src/main/java/com/mzl/flower/service/payment/OrderService.java
@@ -910,6 +910,13 @@
result.add(llc);
}
+
+ BigDecimal t = llc.getTotalAmount();
+ if(t == null){
+ t = new BigDecimal(0);
+ }
+ t = t.add(c.getTotalAmount());
+ llc.setTotalAmount(t);
}
Map<Long, String> stationMap = prepareStationMap();
--
Gitblit v1.9.3