From 18a87d19f80e3b87244546ad080f125587eb9d70 Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <cuizf@fengyuntec.com>
Date: 星期三, 28 八月 2024 21:51:30 +0800
Subject: [PATCH] 验证 降级金额不能大于商品总金额

---
 src/main/java/com/mzl/flower/service/payment/OrderItemSettlementService.java |    6 +++---
 1 files changed, 3 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 e24840f..3d630d4 100644
--- a/src/main/java/com/mzl/flower/service/payment/OrderItemSettlementService.java
+++ b/src/main/java/com/mzl/flower/service/payment/OrderItemSettlementService.java
@@ -128,9 +128,9 @@
                         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)));
+                        BigDecimal markupTwo = oi.getMarkupTwo() == null ? new BigDecimal(0) : oi.getMarkupTwo();
+                        lackFeePlatform = oi.getMarkupOne().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