From 18a3d6e87e6682a19b421155cb168416dd73b349 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期六, 21 九月 2024 22:55:58 +0800
Subject: [PATCH] 1.优惠券文件描述修改,“订单金额不能小于折扣金额”修改成“优惠券使用条件不能小于面值金额”

---
 src/main/java/com/mzl/flower/service/payment/OrderItemSettlementService.java |    2 +-
 1 files changed, 1 insertions(+), 1 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..6de9160 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;

--
Gitblit v1.9.3