From 1681fcf652010ca7e697dea4e5430cf0e5a201ce Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <cuizf@fengyuntec.com>
Date: 星期三, 28 八月 2024 20:55:39 +0800
Subject: [PATCH] 结算 bug 1
---
src/main/java/com/mzl/flower/service/payment/OrderItemSettlementService.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 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..e24840f 100644
--- a/src/main/java/com/mzl/flower/service/payment/OrderItemSettlementService.java
+++ b/src/main/java/com/mzl/flower/service/payment/OrderItemSettlementService.java
@@ -124,8 +124,12 @@
} 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));
+
+ BigDecimal markupPartner = oi.getMarkupPartner() == null ? new BigDecimal(0) : oi.getMarkupPartner();
+ lackFeePartner = markupPartner.multiply(new BigDecimal(lackNum));
+
+ BigDecimal markupOne = oi.getMarkupOne() == null ? new BigDecimal(0) : oi.getMarkupOne();
+ lackFeePlatform = markupOne.multiply(new BigDecimal(lackNum));
lackFeePlatform = lackFeePlatform.add(oi.getMarkupTwo().multiply(new BigDecimal(lackNum)));
} else if (Constants.CHECK_TYPE.replace.name().equals(type)) {
replaceNum = num == null ? 0 : num;
--
Gitblit v1.9.3