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