修改奖励类型,游戏列表接口,

This commit is contained in:
chy
2025-06-11 16:01:46 +08:00
parent 82d8944e7a
commit 118775953b
6 changed files with 27 additions and 8 deletions

View File

@ -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("查询系统奖励失败")
}

View File

@ -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 游戏列表入参

View File

@ -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