From ae1471f378f399f76518539ec8992e64a3673436 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期三, 08 一月 2025 15:26:06 +0800
Subject: [PATCH] 1.订单提交：订单最小金额配置
---
src/main/java/com/mzl/flower/service/payment/OrderItemSettlementService.java | 10 ++++++++--
1 files changed, 8 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 79efe37..f594b57 100644
--- a/src/main/java/com/mzl/flower/service/payment/OrderItemSettlementService.java
+++ b/src/main/java/com/mzl/flower/service/payment/OrderItemSettlementService.java
@@ -130,7 +130,7 @@
BigDecimal markupOne = getAmount(oi.getMarkupOne());
BigDecimal markupTwo = getAmount(oi.getMarkupTwo());
- BigDecimal ppPrice = markupOne.add(markupTwo).subtract(oi.getCouponAmount());//1次加价+2次加价-优惠券金额
+ BigDecimal ppPrice = markupOne.add(markupTwo).subtract(getAmount(oi.getCouponAmount()));//1次加价+2次加价-优惠券金额
lackFeePlatform = lackFeePlatform.add(ppPrice.multiply(new BigDecimal(lackNum)));
} else if (Constants.CHECK_TYPE.replace.name().equals(type)) {
replaceNum = num == null ? 0 : num;
@@ -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);
}
@@ -258,4 +260,8 @@
return fee;
}
+
+ public OrderItemSettlement selectOrderItemSettlementById(String id) {
+ return orderItemSettlementMapper.selectOrderItemSettlementById(id);
+ }
}
--
Gitblit v1.9.3