From d0c7d3e52719a8c60c9f7e61334ae2af2946c75d Mon Sep 17 00:00:00 2001
From: guchengwuyue <guchengwuyue@163.com>
Date: Sat, 22 Jul 2023 13:52:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=94=AE=E5=90=8E=E7=94=B3=E8=AF=B7bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/StoreAfterSalesServiceImpl.java     | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/yshop-mall/src/main/java/co/yixiang/modules/sales/service/impl/StoreAfterSalesServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/sales/service/impl/StoreAfterSalesServiceImpl.java
index a3b9636e..167e2804 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/sales/service/impl/StoreAfterSalesServiceImpl.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/sales/service/impl/StoreAfterSalesServiceImpl.java
@@ -86,7 +86,17 @@ public class StoreAfterSalesServiceImpl extends BaseServiceImpl<StoreAfterSalesM
                 //商品优惠前总金额
                 BigDecimal totalAmountOfGoods = NumberUtil.mul(cartInfo.getTruePrice(), cartInfo.getCartNum());
                 //商品优惠总金额
-                BigDecimal commodityDiscountAmount = NumberUtil.mul(NumberUtil.div(totalAmountOfGoods, NumberUtil.sub(yxStoreOrder.getTotalPrice(), yxStoreOrder.getPayPostage())), yxStoreOrder.getCouponPrice());
+                // BigDecimal commodityDiscountAmount = NumberUtil.mul(NumberUtil.div(totalAmountOfGoods, NumberUtil.sub(yxStoreOrder.getTotalPrice(), yxStoreOrder.getPayPostage())), yxStoreOrder.getCouponPrice());
+                BigDecimal totalPriceMinusPostage = NumberUtil.sub(yxStoreOrder.getTotalPrice(), yxStoreOrder.getPayPostage());
+                BigDecimal commodityDiscountAmount;
+
+                if (totalPriceMinusPostage.compareTo(BigDecimal.ZERO) != 0) {
+                    commodityDiscountAmount = NumberUtil.mul(NumberUtil.div(totalAmountOfGoods, totalPriceMinusPostage), yxStoreOrder.getCouponPrice());
+                } else {
+                    // 处理除数为零的情况，返回默认值
+                    commodityDiscountAmount = BigDecimal.ZERO;
+                }
+
                 //商品优惠后总金额
                 totalPrice = NumberUtil.add(totalPrice, NumberUtil.sub(totalAmountOfGoods, commodityDiscountAmount));
                 // todo 根据自己的业务逻辑修改，是否退运费，默认退运费