From d413de75d3acfb671c1053b867253d00116053ba Mon Sep 17 00:00:00 2001
From: misworga831 <paulgao0831@gmail.com>
Date: Wed, 17 May 2023 14:16:16 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=B4=AD=E7=89=A9?=
 =?UTF-8?q?=E8=BD=A6=E5=95=86=E5=93=81=E4=BF=83=E9=94=80=E4=BB=B7=E6=A0=BC?=
 =?UTF-8?q?=E7=89=B9=E6=AE=8A=E6=83=85=E5=86=B5=E5=A4=84=E7=90=86=E4=B8=AD?=
 =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E9=87=91=E9=A2=9D=E4=B8=BA0?=
 =?UTF-8?q?=E7=9A=84=E6=83=85=E5=86=B5=EF=BC=88=E8=B4=AD=E7=89=A9=E8=BD=A6?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E4=BF=83=E9=94=80=E4=BB=B7=E6=A0=BC=E7=89=B9?=
 =?UTF-8?q?=E6=AE=8A=E6=83=85=E5=86=B5=E5=A4=84=E7=90=86=E5=8F=AA=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E4=BC=98=E6=83=A0=E5=88=B8=E4=B8=8D=E8=B6=B3=E7=9A=84?=
 =?UTF-8?q?=E6=83=85=E5=86=B5=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/order/cart/render/util/PromotionPriceUtil.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/order/cart/render/util/PromotionPriceUtil.java b/framework/src/main/java/cn/lili/modules/order/cart/render/util/PromotionPriceUtil.java
index 0885628f..d375c16f 100644
--- a/framework/src/main/java/cn/lili/modules/order/cart/render/util/PromotionPriceUtil.java
+++ b/framework/src/main/java/cn/lili/modules/order/cart/render/util/PromotionPriceUtil.java
@@ -172,7 +172,7 @@ public class PromotionPriceUtil {
     }
 
     /**
-     * 特殊情况处理，如参与多个促销活动，部分商品在其他促销计算后的金额不足以满足与当前参与的促销活动的优惠金额
+     * 特殊情况处理，如参与多个促销活动，部分商品在其他促销计算后的金额不足以满足与当前参与的促销活动的优惠金额（只计算使用优惠券不足的情况）
      *
      * @param skuVOList          获取购物车信息
      * @param skuPromotionDetail 参与活动的商品，以及商品总金额
@@ -202,7 +202,7 @@ public class PromotionPriceUtil {
                 double point = CurrencyUtil.div(k.getPriceDetailDTO().getGoodsPrice(), totalPrice, 4);
                 //商品优惠金额
                 Double skuDiscountPrice = CurrencyUtil.mul(discountPrice, point);
-                return skuDiscountPrice > k.getPriceDetailDTO().getCouponPrice();
+                return k.getPriceDetailDTO().getCouponPrice() > 0 && skuDiscountPrice > k.getPriceDetailDTO().getCouponPrice();
             }
             return false;
         }).collect(Collectors.toList());