From 018480994e5b940d74e3aa21382908cbd6c58104 Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Tue, 5 Nov 2024 15:17:14 +0800
Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=E9=9C=B8=E7=8E=8B=E9=A4=90?=
 =?UTF-8?q?=E5=85=85=E5=80=BC=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chaozhanggui/system/cashierservice/service/PayService.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
index de45ae3..069540e 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
@@ -460,6 +460,9 @@ public class PayService {
             }
 
             shouldPayAmount = shouldPayAmount.subtract(userCouponVo.getDiscountAmount());
+            if (shouldPayAmount.compareTo(BigDecimal.ZERO) < 0) {
+                shouldPayAmount = new BigDecimal("0.01");
+            }
 
             TbShopCoupon tbShopCoupons = mpShopCouponMapper.selectById(userCouponVo.getCouponId());
             if (tbShopCoupons == null) {

From dfef9c90c8e54c90aa2930a22dfacacdf265ae45 Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Tue, 5 Nov 2024 15:22:26 +0800
Subject: [PATCH 2/4] =?UTF-8?q?feat:=20=E9=9C=B8=E7=8E=8B=E9=A4=90?=
 =?UTF-8?q?=E5=85=85=E5=80=BC=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/service/CartService.java            | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
index d9d8c0d..531a562 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
@@ -1055,7 +1055,9 @@ public class CartService {
                 priceDTO.setPackAmount(priceDTO.getPackAmount().add(cashierCart.getPackFee()));
             }
 
-            priceDTO.setOriginAmount(priceDTO.getOriginAmount().add(cashierCart.getTotalAmount()));
+            if (!"return".equals(cashierCart.getStatus())) {
+                priceDTO.setOriginAmount(priceDTO.getOriginAmount().add(cashierCart.getTotalAmount()));
+            }
 
             TbProductSku productSku = productSkuMapper.selectByPrimaryKey(Integer.valueOf(cashierCart.getSkuId()));
             TbOrderDetail orderDetail = null;

From 7e05e91642a97464a4f7e9936ca730c78803426b Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Tue, 5 Nov 2024 15:24:00 +0800
Subject: [PATCH 3/4] =?UTF-8?q?feat:=20=E9=9C=B8=E7=8E=8B=E9=A4=90?=
 =?UTF-8?q?=E5=85=85=E5=80=BC=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chaozhanggui/system/cashierservice/service/PayService.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
index 069540e..155b00c 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
@@ -420,7 +420,7 @@ public class PayService {
         // 返还优惠券
         returnCoupon(orderInfo, shopCouponService);
 
-        BigDecimal shouldPayAmount = orderInfo.getOriginAmount().multiply(BigDecimal.valueOf(freeDineConfig.getRechargeTimes()));
+        BigDecimal shouldPayAmount = orderInfo.getOrderAmount().multiply(BigDecimal.valueOf(freeDineConfig.getRechargeTimes()));
 
 
         // 霸王餐积分抵扣

From 306f34a30ed2bd24c198ddf5fdbd25f8acdf0fa0 Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Tue, 5 Nov 2024 15:24:29 +0800
Subject: [PATCH 4/4] =?UTF-8?q?feat:=20=E9=9C=B8=E7=8E=8B=E9=A4=90?=
 =?UTF-8?q?=E5=85=85=E5=80=BC=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chaozhanggui/system/cashierservice/service/PayService.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
index 155b00c..069540e 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
@@ -420,7 +420,7 @@ public class PayService {
         // 返还优惠券
         returnCoupon(orderInfo, shopCouponService);
 
-        BigDecimal shouldPayAmount = orderInfo.getOrderAmount().multiply(BigDecimal.valueOf(freeDineConfig.getRechargeTimes()));
+        BigDecimal shouldPayAmount = orderInfo.getOriginAmount().multiply(BigDecimal.valueOf(freeDineConfig.getRechargeTimes()));
 
 
         // 霸王餐积分抵扣