From 46a8faa3b27b30a04c40d3eb90d774429d8581f5 Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <7426394+wuxixiaocui@user.noreply.gitee.com>
Date: 星期四, 05 九月 2024 16:14:16 +0800
Subject: [PATCH] 加价计算空指针
---
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..3d630d4 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,13 @@
} 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));
+
+ BigDecimal markupPartner = oi.getMarkupPartner() == null ? new BigDecimal(0) : oi.getMarkupPartner();
+ lackFeePartner = markupPartner.multiply(new BigDecimal(lackNum));
+
+ BigDecimal markupTwo = oi.getMarkupTwo() == null ? new BigDecimal(0) : oi.getMarkupTwo();
lackFeePlatform = oi.getMarkupOne().multiply(new BigDecimal(lackNum));
- lackFeePlatform = lackFeePlatform.add(oi.getMarkupTwo().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