From c324ecf0548168cc59987c25e382675de3dd4094 Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Fri, 23 Aug 2024 16:20:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=8F=96=E6=B6=88=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=97=B6=E9=87=8D=E5=A4=8D=E6=B6=88=E8=B4=B9=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/amqp/consumer/CancelUnPayOrder.go | 18 ++----------------
 api/controller/OrderSingle.go         |  8 +-------
 api/service/OrderMember.go            | 16 ++++++++--------
 3 files changed, 11 insertions(+), 31 deletions(-)

diff --git a/api/amqp/consumer/CancelUnPayOrder.go b/api/amqp/consumer/CancelUnPayOrder.go
index 200fb48..6746c49 100644
--- a/api/amqp/consumer/CancelUnPayOrder.go
+++ b/api/amqp/consumer/CancelUnPayOrder.go
@@ -82,14 +82,7 @@ func CancelUnPayOrder(msg amqp091.Delivery) {
 
 		orderSingleService := service.OrderSingleService{}
 		res, err := orderSingleService.CancelOrderSingle(tx, orderSingle, 3)
-		if err != nil {
-			tx.Rollback()
-			utils.LogJsonErr("consumer.CancelUnPayOrder:", err)
-			_ = msg.Reject(true)
-			return
-		}
-
-		if res == false {
+		if err != nil && res == false {
 			tx.Rollback()
 			utils.LogJsonErr("consumer.CancelUnPayOrder:", "取消失败")
 			_ = msg.Reject(true)
@@ -114,14 +107,7 @@ func CancelUnPayOrder(msg amqp091.Delivery) {
 
 		orderMemberService := service.OrderMemberService{}
 		res, err := orderMemberService.CancelOrderMember(tx, orderMember, 3)
-		if err != nil {
-			tx.Rollback()
-			utils.LogJsonErr("consumer.CancelUnPayOrder:", err)
-			_ = msg.Reject(true)
-			return
-		}
-
-		if res == false {
+		if err != nil && res == false {
 			tx.Rollback()
 			utils.LogJsonErr("consumer.CancelUnPayOrder:", "取消失败")
 			_ = msg.Reject(true)
diff --git a/api/controller/OrderSingle.go b/api/controller/OrderSingle.go
index d8f2c61..02efc13 100644
--- a/api/controller/OrderSingle.go
+++ b/api/controller/OrderSingle.go
@@ -167,13 +167,7 @@ func (b *OrderSingle) PutCancelOrderSingle(c *gin.Context) {
 	// 取消单项订单
 	orderSingleService := service.OrderSingleService{}
 	res, err := orderSingleService.CancelOrderSingle(tx, orderSingle, 1)
-	if err != nil {
-		tx.Rollback()
-		responses.FailWithMessage(err.Error(), c)
-		return
-	}
-
-	if res == false {
+	if err != nil && res == false {
 		tx.Rollback()
 		responses.FailWithMessage("取消订单失败", c)
 		return
diff --git a/api/service/OrderMember.go b/api/service/OrderMember.go
index 0f73ed1..5199fa4 100644
--- a/api/service/OrderMember.go
+++ b/api/service/OrderMember.go
@@ -236,38 +236,38 @@ func (r *OrderMemberService) CancelOrderMember(tx *gorm.DB, orderMember *model.O
 
 	// 订单状态（1:待支付 2:已完成 3:已取消）
 	if orderMember.OrderStatus == 2 {
-		return false, errors.New("订单已完成,无法取消")
+		return true, errors.New("订单已完成,无法取消")
 	}
 
 	if orderMember.OrderStatus == 3 {
-		return false, errors.New("订单已取消,请勿重复操作")
+		return true, errors.New("订单已取消,请勿重复操作")
 	}
 
 	// 取消状态（0:否 1:是）
 	if orderMember.CancelStatus == 1 {
-		return false, errors.New("订单已取消")
+		return true, errors.New("订单已取消")
 	}
 
 	// 支付状态（1:未支付 2:已支付 3:支付中 4:支付失败 5:支付超时 6:支付关闭 7:已撤销 8:转入退款）
 	if orderMember.PayStatus == 2 {
-		return false, errors.New("订单已支付,无法取消")
+		return true, errors.New("订单已支付,无法取消")
 	}
 
 	// 订单退款状态（0:无退款 1:申请退款 2:退款中 3:退款成功 4:拒绝退款 5:退款关闭 6:退款异常 7:部分退款）
 	if orderMember.RefundStatus == 1 {
-		return false, errors.New("订单已申请退款")
+		return true, errors.New("订单已申请退款")
 	}
 
 	if orderMember.RefundStatus == 2 {
-		return false, errors.New("订单退款中")
+		return true, errors.New("订单退款中")
 	}
 
 	if orderMember.RefundStatus == 3 {
-		return false, errors.New("订单已退款成功")
+		return true, errors.New("订单已退款成功")
 	}
 
 	if orderMember.RefundStatus == 6 {
-		return false, errors.New("订单退款异常")
+		return true, errors.New("订单退款异常")
 	}
 
 	// 修改订单为取消