From 118775953b938a2c099ababfd9c36975a5c75a7c Mon Sep 17 00:00:00 2001 From: chy <2463300564@qq.com> Date: Wed, 11 Jun 2025 16:01:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A5=96=E5=8A=B1=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=EF=BC=8C=E6=B8=B8=E6=88=8F=E5=88=97=E8=A1=A8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/game/v1/game.go | 2 +- internal/logic/reward/reward.go | 8 +++++++- internal/model/game.go | 1 + internal/model/rewardType.go | 19 +++++++++++++------ utility/ecode/common.go | 1 + utility/jwt/jwt.go | 4 ++++ 6 files changed, 27 insertions(+), 8 deletions(-) diff --git a/api/game/v1/game.go b/api/game/v1/game.go index 64fc3ec..ef1de22 100644 --- a/api/game/v1/game.go +++ b/api/game/v1/game.go @@ -31,7 +31,7 @@ type UpdateReq struct { GameName string `json:"gameName" v:"required#游戏名称不能为空" dc:"游戏名称"` GameCode string `json:"gameCode" v:"required#游戏代号不能为空" dc:"游戏代号"` Avatar string `json:"avatar" dc:"游戏图标"` - Id int64 `json:"id" v:"required#游戏ID不能为空" dc:"ID"` + Id int64 `json:"id" v:"required#ID不能为空" dc:"ID"` } type UpdateRes struct { diff --git a/internal/logic/reward/reward.go b/internal/logic/reward/reward.go index 07d469c..bac8443 100644 --- a/internal/logic/reward/reward.go +++ b/internal/logic/reward/reward.go @@ -150,9 +150,15 @@ func (s *sReward) ListSystemReward(ctx context.Context, in *model.RewardListIn) m = m.Where(do.Rewards{RewardTypeId: in.RewardTypeID}) } + if in.Status > 0 { + m = m.Where(do.Rewards{ + Status: in.Status, + }) + } + list := make([]model.Reward, 0) var total int - err = m.Page(in.Page, in.Size).Where(do.Rewards{RewardScope: 1, Status: in.Status}).OrderDesc(dao.Rewards.Columns().CreatedAt).OrderDesc(dao.Rewards.Columns().Id).ScanAndCount(&list, &total, false) + err = m.Page(in.Page, in.Size).Where(do.Rewards{RewardScope: 1}).OrderDesc(dao.Rewards.Columns().CreatedAt).OrderDesc(dao.Rewards.Columns().Id).ScanAndCount(&list, &total, false) if err != nil { return nil, ecode.Fail.Sub("查询系统奖励失败") } diff --git a/internal/model/game.go b/internal/model/game.go index 97d0a2a..171d327 100644 --- a/internal/model/game.go +++ b/internal/model/game.go @@ -5,6 +5,7 @@ type Game struct { GameName string `json:"gameName" orm:"game_name"` // 游戏名称 GameCode string `json:"gameCode" orm:"game_code"` // 游戏代号 Avatar string `json:"avatar" orm:"avatar"` // 图标 + Id int64 `json:"id" orm:"id"` } // GameListIn 游戏列表入参 diff --git a/internal/model/rewardType.go b/internal/model/rewardType.go index 7a96ee1..f4ccb1e 100644 --- a/internal/model/rewardType.go +++ b/internal/model/rewardType.go @@ -1,13 +1,20 @@ package model -import "github.com/gogf/gf/v2/frame/g" +import ( + "github.com/gogf/gf/v2/frame/g" + "github.com/gogf/gf/v2/os/gtime" +) type RewardType struct { - g.Meta `orm:"table:reward_type"` - Id int64 `json:"id" dc:"ID" orm:"id,primary"` - Name string `json:"name" dc:"名称" orm:"name"` - Sort int `json:"sort" dc:"排序" orm:"sort"` - Status int `json:"status" dc:"状态：1=启用，2=禁用" orm:"status"` + g.Meta `orm:"table:reward_type"` + Id int64 `json:"id" dc:"ID" orm:"id,primary"` + Name string `json:"name" dc:"名称" orm:"name"` + Code string `json:"code" dc:"代号" orm:"code"` + Status int `json:"status" dc:"状态：1=启用，2=禁用" orm:"status"` + Description string `json:"description" dc:"描述" orm:"description"` + CreatedAt *gtime.Time `json:"createdAt" orm:"created_at" description:"创建时间"` + UpdatedAt *gtime.Time `json:"updatedAt" orm:"updated_at" description:"更新时间"` + DeletedAt *gtime.Time `json:"deletedAt" orm:"deleted_at" description:"删除时间"` } type RewardTypeIn struct { Page int diff --git a/utility/ecode/common.go b/utility/ecode/common.go index a6ad342..d929b66 100644 --- a/utility/ecode/common.go +++ b/utility/ecode/common.go @@ -9,6 +9,7 @@ var ( Logout = New(5, "用户未登录") Disabled = New(6, "账户已被禁用") Denied = New(7, "没有权限执行该操作") + Expire = New(8, "token已过期") Auth = New(1000, "账户名或密码不正确") Password = New(1001, "密码不正确") EmailExist = New(1002, "该邮箱已被注册") diff --git a/utility/jwt/jwt.go b/utility/jwt/jwt.go index a096a0d..4287d10 100644 --- a/utility/jwt/jwt.go +++ b/utility/jwt/jwt.go @@ -1,6 +1,7 @@ package jwt import ( + "errors" "server/utility/ecode" "strings" "time" @@ -99,6 +100,9 @@ func ParseToken(tokenString string) (*TokenOut, error) { return secretKey, nil }) if err != nil { + if errors.Is(err, jwt.ErrTokenExpired) { + return nil, ecode.Expire.Sub("token 已过期") + } return nil, ecode.Fail.Sub("解析 token 出现异常") }