From ddd3f57bdfe66c76735b96b794d1978401fa48b6 Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Thu, 8 Aug 2024 17:39:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=BA=86=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BC=9A=E5=91=98=E8=BF=87=E6=9C=9F=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E8=AE=A1=E7=AE=97=E3=80=82=E5=A2=9E=E5=8A=A0=E4=BA=86?=
 =?UTF-8?q?=E5=8D=95=E9=A1=B9=E8=AE=A2=E5=8D=95=E6=94=AF=E4=BB=98=E6=88=90?=
 =?UTF-8?q?=E5=8A=9F=E5=90=8E=EF=BC=8C=E6=9C=89=E6=95=88=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E7=9A=84=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/controller/CallBack.go | 16 ++++++++++++++++
 api/controller/Question.go |  6 +++---
 api/service/User.go        |  7 ++++---
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/api/controller/CallBack.go b/api/controller/CallBack.go
index d87d967..17329b0 100644
--- a/api/controller/CallBack.go
+++ b/api/controller/CallBack.go
@@ -86,6 +86,22 @@ func (r *CallBack) WxPaySingle(c *gin.Context) {
 	}
 	orderSingleData["escrow_trade_no"] = transaction.TransactionId
 	orderSingleData["updated_at"] = time.Now().Format("2006-01-02 15:04:05")
+
+	// 处理单项有效时间
+	if *wxPayResult.PayStatus == 2 {
+		systemSingleDao := dao.SystemSingleDao{}
+
+		maps := make(map[string]interface{})
+		systemSingle, err := systemSingleDao.GetSystemSingle(maps)
+		if err != nil {
+			tx.Rollback()
+			c.JSON(http.StatusBadRequest, gin.H{"code": "ERROR", "message": err})
+			return
+		}
+
+		orderSingleData["valid_date"] = time.Now().Add(time.Duration(systemSingle.ValidDays) * 24 * time.Hour)
+	}
+
 	err = orderSingleDao.EditOrderSingleById(tx, orderSingle.OrderId, orderSingleData)
 	if err != nil {
 		tx.Rollback()
diff --git a/api/controller/Question.go b/api/controller/Question.go
index 89b6c91..0a90615 100644
--- a/api/controller/Question.go
+++ b/api/controller/Question.go
@@ -116,9 +116,6 @@ func (r *Question) GetQuestion(c *gin.Context) {
 		return
 	}
 
-	// 获取问题被购买数量
-	buyCount, _ := questionService.GetQuestionBuyCount(userId, questionId)
-
 	g := dto.GetQuestionDto(question)
 
 	// 加载数据-是否收藏
@@ -127,6 +124,9 @@ func (r *Question) GetQuestion(c *gin.Context) {
 	// 加载数据-首次购买价格
 	g.LoadFirstTimePrice(firstTimePrice)
 
+	// 获取问题被购买数量
+	buyCount, _ := questionService.GetQuestionBuyCount(userId, questionId)
+
 	// 加载数据-问题被购买数量
 	g.LoadBuyCount(buyCount)
 
diff --git a/api/service/User.go b/api/service/User.go
index 29b7419..b854b9b 100644
--- a/api/service/User.go
+++ b/api/service/User.go
@@ -107,12 +107,13 @@ func (r *UserService) AddUserMemberValidDate(tx *gorm.DB, user *model.User, d in
 		userData["is_member"] = 1
 	}
 
+	var t time.Time
 	if user.MemberExpireDate == nil {
-		userData["is_member"] = time.Now().Format("2006-01-02 15:04:05")
+		t = time.Now()
 	} else {
-		t := time.Time(*user.MemberExpireDate)
-		userData["is_member"] = t.Add(time.Duration(d) * 24 * time.Hour)
+		t = time.Time(*user.MemberExpireDate)
 	}
+	userData["is_member"] = t.Add(time.Duration(d) * 24 * time.Hour)
 
 	userDao := dao.UserDao{}
 	err := userDao.EditUserById(tx, user.UserId, userData)