From 4011c39b78491107e0c921871f787e3ff6d8174d Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Tue, 27 Aug 2024 11:08:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86defer=E7=9A=84?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E8=BF=94=E5=9B=9E=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/controller/Login.go       |  4 +++-
 api/controller/OrderMember.go |  3 +++
 api/controller/OrderSingle.go |  9 +++++++++
 api/controller/Pay.go         | 14 +++++++-------
 api/controller/Question.go    |  6 ++++++
 api/controller/UserCase.go    |  3 +++
 6 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/api/controller/Login.go b/api/controller/Login.go
index 3d9286f..820d6b0 100644
--- a/api/controller/Login.go
+++ b/api/controller/Login.go
@@ -48,8 +48,10 @@ func (r *Login) Login(c *gin.Context) {
 	tx := global.Db.Begin()
 	defer func() {
 		if r := recover(); r != nil {
-			fmt.Println(r)
 			tx.Rollback()
+			utils.LogJsonErr("操作失败", r)
+			responses.FailWithMessage("操作失败", c)
+			return
 		}
 	}()
 
diff --git a/api/controller/OrderMember.go b/api/controller/OrderMember.go
index d0962de..f92d1a5 100644
--- a/api/controller/OrderMember.go
+++ b/api/controller/OrderMember.go
@@ -107,6 +107,9 @@ func (b *OrderMember) AddOrderMember(c *gin.Context) {
 	defer func() {
 		if r := recover(); r != nil {
 			tx.Rollback()
+			utils.LogJsonErr("订单创建失败", r)
+			responses.FailWithMessage("订单创建失败", c)
+			return
 		}
 	}()
 
diff --git a/api/controller/OrderSingle.go b/api/controller/OrderSingle.go
index e06741c..d645621 100644
--- a/api/controller/OrderSingle.go
+++ b/api/controller/OrderSingle.go
@@ -107,6 +107,9 @@ func (b *OrderSingle) AddOrderSingle(c *gin.Context) {
 	defer func() {
 		if r := recover(); r != nil {
 			tx.Rollback()
+			utils.LogJsonErr("订单创建失败", r)
+			responses.FailWithMessage("订单创建失败", c)
+			return
 		}
 	}()
 
@@ -311,6 +314,9 @@ func (b *OrderSingle) DeleteOrderSingle(c *gin.Context) {
 	defer func() {
 		if r := recover(); r != nil {
 			tx.Rollback()
+			utils.LogJsonErr("操作失败", r)
+			responses.FailWithMessage("操作失败", c)
+			return
 		}
 	}()
 
@@ -426,6 +432,9 @@ func (b *OrderSingle) PutOrderSingleAnswer(c *gin.Context) {
 	defer func() {
 		if r := recover(); r != nil {
 			tx.Rollback()
+			utils.LogJsonErr("操作失败", r)
+			responses.FailWithMessage("操作失败", c)
+			return
 		}
 	}()
 
diff --git a/api/controller/Pay.go b/api/controller/Pay.go
index 1edd5bc..3824f29 100644
--- a/api/controller/Pay.go
+++ b/api/controller/Pay.go
@@ -11,6 +11,7 @@ import (
 	"hepa-calc-api/global"
 	"hepa-calc-api/utils"
 	"net/http"
+	"time"
 )
 
 type Pay struct{}
@@ -136,14 +137,13 @@ func (r *Pay) GetPayOrder(c *gin.Context) {
 	}
 
 	// 验证订单过期支付时间
-	//now := time.Now()
-	//validTime := time.Time(createdAt).Add(30 * time.Minute)
-	//if validTime.Before(now) {
-	//	c.JSON(http.StatusOK, gin.H{"code": 90001, "message": "订单已关闭", "data": nil})
-	//	return
-	//}
+	now := time.Now()
+	validTime := time.Time(createdAt).Add(30 * time.Minute)
+	if validTime.Before(now) {
+		c.JSON(http.StatusOK, gin.H{"code": 90001, "message": "订单已关闭", "data": nil})
+		return
+	}
 
-	fmt.Println(createdAt)
 	// 获取用户数据
 	userDao := dao.UserDao{}
 	user, err := userDao.GetUserById(userId)
diff --git a/api/controller/Question.go b/api/controller/Question.go
index a43652d..99aeef0 100644
--- a/api/controller/Question.go
+++ b/api/controller/Question.go
@@ -269,6 +269,9 @@ func (r *Question) PutQuestionClickCount(c *gin.Context) {
 	defer func() {
 		if r := recover(); r != nil {
 			tx.Rollback()
+			utils.LogJsonErr("操作失败", r)
+			responses.FailWithMessage("操作失败", c)
+			return
 		}
 	}()
 
@@ -319,6 +322,9 @@ func (r *Question) PutQuestionSubmitCount(c *gin.Context) {
 	defer func() {
 		if r := recover(); r != nil {
 			tx.Rollback()
+			utils.LogJsonErr("操作失败", r)
+			responses.FailWithMessage("操作失败", c)
+			return
 		}
 	}()
 
diff --git a/api/controller/UserCase.go b/api/controller/UserCase.go
index 57d72c0..dca6470 100644
--- a/api/controller/UserCase.go
+++ b/api/controller/UserCase.go
@@ -144,6 +144,9 @@ func (r *UserCase) PutUserCase(c *gin.Context) {
 	defer func() {
 		if r := recover(); r != nil {
 			tx.Rollback()
+			utils.LogJsonErr("操作失败", r)
+			responses.FailWithMessage("操作失败", c)
+			return
 		}
 	}()