From 323fab28d7bbebd61352c8a3f2854dbbc7a2327f Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Thu, 5 Sep 2024 16:40:22 +0800
Subject: [PATCH] 333

---
 api/amqp/consumer/CancelUnPayOrder.go | 4 ++--
 api/service/OrderMember.go            | 2 +-
 api/service/OrderSingle.go            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/api/amqp/consumer/CancelUnPayOrder.go b/api/amqp/consumer/CancelUnPayOrder.go
index e9a86ed..2dd81aa 100644
--- a/api/amqp/consumer/CancelUnPayOrder.go
+++ b/api/amqp/consumer/CancelUnPayOrder.go
@@ -124,6 +124,8 @@ func CancelUnPayOrder(msg amqp091.Delivery) {
 		}
 	}
 
+	tx.Commit()
+
 	// 关闭支付订单
 	if data.PayChannel == 1 {
 		// h5支付
@@ -141,7 +143,5 @@ func CancelUnPayOrder(msg amqp091.Delivery) {
 		}
 	}
 
-	tx.Commit()
-
 	_ = msg.Ack(false)
 }
diff --git a/api/service/OrderMember.go b/api/service/OrderMember.go
index 02728bf..ea8ad21 100644
--- a/api/service/OrderMember.go
+++ b/api/service/OrderMember.go
@@ -193,7 +193,7 @@ func (r *OrderMemberService) AddOrderMember(tx *gorm.DB, UserId, SystemMemberId
 		delay := 30 * time.Minute
 
 		if config.C.Env == "dev" {
-			delay = 1 * time.Minute
+			delay = 3 * time.Minute
 		}
 
 		data := make(map[string]interface{})
diff --git a/api/service/OrderSingle.go b/api/service/OrderSingle.go
index b930430..e0a83e7 100644
--- a/api/service/OrderSingle.go
+++ b/api/service/OrderSingle.go
@@ -221,7 +221,7 @@ func (r *OrderSingleService) AddOrderSingle(tx *gorm.DB, UserId, QuestionId int6
 		delay := 30 * time.Minute
 
 		if config.C.Env == "dev" {
-			delay = 1 * time.Minute
+			delay = 3 * time.Minute
 		}
 
 		data := make(map[string]interface{})