From 0e0c172d8df7ac99571bf33c3c78f41fa284fabe Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Mon, 9 Sep 2024 16:06:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E4=BC=9A=E5=91=98=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=94=AF=E4=BB=98=E6=88=90=E5=8A=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/controller/OrderSingle.go | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/api/controller/OrderSingle.go b/api/controller/OrderSingle.go
index d9e40a6..e3f9413 100644
--- a/api/controller/OrderSingle.go
+++ b/api/controller/OrderSingle.go
@@ -44,14 +44,31 @@ func (b *OrderSingle) GetOrderSinglePage(c *gin.Context) {
 
 	// 获取数据
 	orderSingleDao := dao.OrderSingleDao{}
-	orderSingle, total, err := orderSingleDao.GetOrderSinglePageSearch(req, req.Page, req.PageSize)
+	orderSingles, total, err := orderSingleDao.GetOrderSinglePageSearch(req, req.Page, req.PageSize)
 	if err != nil {
 		responses.FailWithMessage(err.Error(), c)
 		return
 	}
 
+	// 获取用户数据
+	userDao := dao.UserDao{}
+	user, err := userDao.GetUserById(userId)
+	if err != nil || user == nil {
+		responses.FailWithMessage("用户错误", c)
+		return
+	}
+
+	// 检测用户会员
+	userService := service.UserService{}
+	isMember := userService.CheckUserMember(user)
+	if isMember == true {
+		for _, v := range orderSingles {
+			v.ValidDate = user.MemberExpireDate
+		}
+	}
+
 	// 处理返回值
-	g := dto.GetOrderSingleListDto(orderSingle)
+	g := dto.GetOrderSingleListDto(orderSingles)
 
 	result := make(map[string]interface{})
 	result["page"] = req.Page