From 392c1807381b9ee701e5565addf81d16cbe630ed Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Thu, 5 Sep 2024 16:05:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E9=80=80?=
 =?UTF-8?q?=E6=8D=A2=E4=BC=98=E6=83=A0=E5=8D=B7=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/service/OrderMember.go | 5 ++---
 api/service/OrderSingle.go | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/api/service/OrderMember.go b/api/service/OrderMember.go
index 181f8d4..02728bf 100644
--- a/api/service/OrderMember.go
+++ b/api/service/OrderMember.go
@@ -293,9 +293,8 @@ func (r *OrderMemberService) CancelOrderMember(tx *gorm.DB, orderMember *model.O
 		return false, errors.New("订单取消失败")
 	}
 
-	// 处理支付金额为0时退还优惠卷问题
-	if orderMember.PaymentAmountTotal == 0 {
-		// 退还订单优惠卷
+	// 退还订单优惠卷
+	if orderMember.CouponAmountTotal > 0 {
 		err = r.OrderCouponRefund(tx, orderMember)
 		if err != nil {
 			tx.Rollback()
diff --git a/api/service/OrderSingle.go b/api/service/OrderSingle.go
index 694ec7d..b930430 100644
--- a/api/service/OrderSingle.go
+++ b/api/service/OrderSingle.go
@@ -339,9 +339,8 @@ func (r *OrderSingleService) CancelOrderSingle(tx *gorm.DB, orderSingle *model.O
 		return false, errors.New("订单取消失败")
 	}
 
-	// 处理支付金额为0时退还优惠卷问题
-	if orderSingle.PaymentAmountTotal == 0 {
-		// 退还订单优惠卷
+	// 退还订单优惠卷
+	if orderSingle.CouponAmountTotal > 0 {
 		err = r.OrderCouponRefund(tx, orderSingle)
 		if err != nil {
 			tx.Rollback()