diff --git a/controller/game_card.go b/controller/game_card.go index 5863e0e..db94724 100644 --- a/controller/game_card.go +++ b/controller/game_card.go @@ -38,8 +38,9 @@ func GameCardList(c *gin.Context) { } uc := auth.GetCurrentUser(c) if uc == nil { - RespJson(c, status.Unauthorized, nil) - return + //RespJson(c, status.Unauthorized, nil) + //return + uc = &auth.UserClaims{Uid: 0} } fmt.Println("游戏类型:GameTypeIds:", req.GameTypeIds) diff --git a/lib/auth/auth_user.go b/lib/auth/auth_user.go index 5e06941..fc7c990 100755 --- a/lib/auth/auth_user.go +++ b/lib/auth/auth_user.go @@ -48,7 +48,8 @@ func UserAccessAuth(c *gin.Context) { token = s[1] } if token == "" || len(token) < 10 { - RespJson(c, status.Unauthorized, nil) + // TODO + //RespJson(c, status.Unauthorized, nil) return } @@ -58,9 +59,11 @@ func UserAccessAuth(c *gin.Context) { logger.Error(err) if err == TokenExpired { RespJson(c, status.AccessTokenExpired, nil) - } else { - RespJson(c, status.Unauthorized, nil) } + // TODO + //else { + // RespJson(c, status.Unauthorized, nil) + //} return } diff --git a/model/game_card.go b/model/game_card.go index 7080416..f3cbfb1 100644 --- a/model/game_card.go +++ b/model/game_card.go @@ -87,7 +87,6 @@ func GetGameCardList(sortType, page, pageSize int, gameTypeIds []uint64, storeId // logger.Error("NewGameCardQuerySet err:", err) // return cards, 0, err //} - user := GetUserByUid(uid) qs := NewGameCardQuerySet(DB).IDNe(914) switch sortType { @@ -142,8 +141,12 @@ func GetGameCardList(sortType, page, pageSize int, gameTypeIds []uint64, storeId qs = qs.IDIn(gameIds...) } - if user.MemberExpire.After(time.Now().AddDate(0, 0, -14)) { - qs = qs.RealPriceLte(30000) + if uid != 0 { + user := GetUserByUid(uid) + if user.MemberExpire.After(time.Now()) && + user.MemberExpire.AddDate(0, 0, -14).Before(time.Now()) { + qs = qs.RealPriceLte(30000) + } } if count == 0 { count, err = qs.Count() diff --git a/model/model_test.go b/model/model_test.go index 6f4ab7a..ad46286 100644 --- a/model/model_test.go +++ b/model/model_test.go @@ -121,6 +121,7 @@ func InitTestDB() { &GameCard{}, &FundRecord{}, + &User{}, ) fmt.Println("DB init success")