From 92a4c3c35747bf1a043c2ff85650012d4eac9355 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期二, 10 九月 2024 10:48:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/mzl/flower/service/payment/OrderItemSettlementService.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 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 aaee743..e645d58 100644
--- a/src/main/java/com/mzl/flower/service/payment/OrderItemSettlementService.java
+++ b/src/main/java/com/mzl/flower/service/payment/OrderItemSettlementService.java
@@ -124,9 +124,14 @@
} else if (Constants.CHECK_TYPE.lack.name().equals(type)) {
lackNum = num == null ? 0 : num;
lackFeeSupplier = oi.getSupplierPrice().multiply(new BigDecimal(lackNum));
- lackFeePartner = oi.getMarkupPartner().multiply(new BigDecimal(lackNum));
- lackFeePlatform = oi.getMarkupOne().multiply(new BigDecimal(lackNum));
- lackFeePlatform = lackFeePlatform.add(oi.getMarkupTwo().multiply(new BigDecimal(lackNum)));
+
+ BigDecimal markupPartner = getAmount(oi.getMarkupPartner());
+ lackFeePartner = markupPartner.multiply(new BigDecimal(lackNum));
+
+ BigDecimal markupOne = getAmount(oi.getMarkupOne());
+ BigDecimal markupTwo = getAmount(oi.getMarkupTwo());
+ lackFeePlatform = markupOne.multiply(new BigDecimal(lackNum));
+ lackFeePlatform = lackFeePlatform.add(markupTwo.multiply(new BigDecimal(lackNum)));
} else if (Constants.CHECK_TYPE.replace.name().equals(type)) {
replaceNum = num == null ? 0 : num;
replaceFee = amount == null ? new BigDecimal(0) : amount;
--
Gitblit v1.9.3