From f38160a365599318dae24eb2b9f07de8b78f7e1e Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期五, 11 十月 2024 08:41:04 +0800
Subject: [PATCH] Merge branch 'master-v2' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v2
---
src/main/java/com/mzl/flower/service/payment/OrderItemSettlementService.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/payment/OrderItemSettlementService.java b/src/main/java/com/mzl/flower/service/payment/OrderItemSettlementService.java
index 6de9160..96f93ad 100644
--- a/src/main/java/com/mzl/flower/service/payment/OrderItemSettlementService.java
+++ b/src/main/java/com/mzl/flower/service/payment/OrderItemSettlementService.java
@@ -173,8 +173,10 @@
BigDecimal feePlatformPack = s.getFeePlatformPack();
BigDecimal feePlatformCheck = s.getFeePlatformCheck();
BigDecimal feePlatformTransport = s.getFeePlatformTransport();
+ BigDecimal feePackingTransport = s.getFeePackingTransport();
salesFeePlatform = salesFeePlatform.add(feePlatform)
- .add(feePlatformPack).add(feePlatformCheck).add(feePlatformTransport);
+ .add(feePlatformPack).add(feePlatformCheck)
+ .add(feePlatformTransport).add(feePackingTransport);
salesFeeSupplier = salesFeeSupplier.add(feeSupplier);
salesFeePartner = salesFeePartner.add(feePartner);
}
--
Gitblit v1.9.3