Commit 6df4243bda1687e2d3513ec046a329e09f0c6ef0
1 parent
aadc462c
Exists in
master
and in
1 other branch
feat✨:活动信息接口
Showing
5 changed files
with
44 additions
and
5 deletions
Show diff stats
controllers/cardholder.go
| @@ -10,6 +10,18 @@ type CardHolderController struct { | @@ -10,6 +10,18 @@ type CardHolderController struct { | ||
| 10 | BaseController | 10 | BaseController |
| 11 | } | 11 | } |
| 12 | 12 | ||
| 13 | +// ActivityInfo 活动信息 | ||
| 14 | +func (c *CardHolderController) ActivityInfo() { | ||
| 15 | + req := new(models.ReqCardHolderActivityInfo) | ||
| 16 | + if !c.GetPostData(req) { | ||
| 17 | + return | ||
| 18 | + } | ||
| 19 | + | ||
| 20 | + code, rsp := cardholder.HandleActivityInfo(req) | ||
| 21 | + | ||
| 22 | + c.RetRspCodeData(code, rsp) | ||
| 23 | +} | ||
| 24 | + | ||
| 13 | // Info 卡包信息 | 25 | // Info 卡包信息 |
| 14 | func (c *CardHolderController) Info() { | 26 | func (c *CardHolderController) Info() { |
| 15 | req := new(models.ReqCardHolderInfo) | 27 | req := new(models.ReqCardHolderInfo) |
models/cardholder.go
| 1 | package models | 1 | package models |
| 2 | 2 | ||
| 3 | -// 海滩卡包 | 3 | +// 卡包 |
| 4 | + | ||
| 5 | +// ReqCardHolderActivityInfo 请求 活动信息 | ||
| 6 | +type ReqCardHolderActivityInfo struct { | ||
| 7 | + BaseLoginInfo | ||
| 8 | + BaseSign | ||
| 9 | +} | ||
| 10 | + | ||
| 11 | +// RspCardHolderActivityInfo 返回 活动信息 | ||
| 12 | +type RspCardHolderActivityInfo struct { | ||
| 13 | + ActivityId int64 `form:"activity_id" json:"activity_id"` // 活动配置 0=无活动 | ||
| 14 | + PreviewTime int64 `form:"preview_time" json:"preview_time"` // 活动预告时间 | ||
| 15 | + StartTime int64 `form:"start_time" json:"start_time"` // 活动开始时间 | ||
| 16 | + EndTime int64 `form:"end_time" json:"end_time"` // 活动结束时间 | ||
| 17 | +} | ||
| 4 | 18 | ||
| 5 | // CardHolderInfo 卡包信息 | 19 | // CardHolderInfo 卡包信息 |
| 6 | type CardHolderInfo struct { | 20 | type CardHolderInfo struct { |
| @@ -8,8 +22,6 @@ type CardHolderInfo struct { | @@ -8,8 +22,6 @@ type CardHolderInfo struct { | ||
| 8 | Cards map[int]int `form:"cards" json:"cards"` // 每张卡集了多少张 k=卡牌ID v=数量 | 22 | Cards map[int]int `form:"cards" json:"cards"` // 每张卡集了多少张 k=卡牌ID v=数量 |
| 9 | Album map[string]int `form:"album" json:"album"` // 卡组奖励领取 k=卡组ID v=数量 | 23 | Album map[string]int `form:"album" json:"album"` // 卡组奖励领取 k=卡组ID v=数量 |
| 10 | Round int `form:"round" json:"round"` // 卡册当前轮次 | 24 | Round int `form:"round" json:"round"` // 卡册当前轮次 |
| 11 | - StartTime int64 `form:"start_time" json:"start_time"` // 活动开始时间 | ||
| 12 | - EndTime int64 `form:"end_time" json:"end_time"` // 活动结束时间 | ||
| 13 | } | 25 | } |
| 14 | 26 | ||
| 15 | // ReqCardHolderInfo 请求 卡包信息 | 27 | // ReqCardHolderInfo 请求 卡包信息 |
routers/router.go
| @@ -11,6 +11,8 @@ func init() { | @@ -11,6 +11,8 @@ func init() { | ||
| 11 | prefix := "/3ad7e4ab95ae2249" | 11 | prefix := "/3ad7e4ab95ae2249" |
| 12 | 12 | ||
| 13 | // 海滩项目 | 13 | // 海滩项目 |
| 14 | + // 活动信息 | ||
| 15 | + beego.Router(prefix+"/cardholder/activityinfo", &controllers.CardHolderController{}, "post:ActivityInfo") | ||
| 14 | // 卡包信息 | 16 | // 卡包信息 |
| 15 | beego.Router(prefix+"/cardholder/info", &controllers.CardHolderController{}, "post:Info") | 17 | beego.Router(prefix+"/cardholder/info", &controllers.CardHolderController{}, "post:Info") |
| 16 | // 获取卡包 | 18 | // 获取卡包 |
service/cardholder/handle.go
| @@ -10,6 +10,21 @@ import ( | @@ -10,6 +10,21 @@ import ( | ||
| 10 | "strconv" | 10 | "strconv" |
| 11 | ) | 11 | ) |
| 12 | 12 | ||
| 13 | +// HandleActivityInfo 活动信息 | ||
| 14 | +func HandleActivityInfo(req *models.ReqCardHolderActivityInfo) (code string, rsp models.RspCardHolderActivityInfo) { | ||
| 15 | + rsp = models.RspCardHolderActivityInfo{} | ||
| 16 | + code = constd.RECODE_OK | ||
| 17 | + | ||
| 18 | + // 尝试更新配置 | ||
| 19 | + config, _ := TryUpdateConfig(req.GameID) | ||
| 20 | + rsp.ActivityId = config.Id | ||
| 21 | + rsp.PreviewTime = config.Raw.PreviewTime | ||
| 22 | + rsp.StartTime = config.Raw.StartTime | ||
| 23 | + rsp.EndTime = config.Raw.EndTime | ||
| 24 | + | ||
| 25 | + return | ||
| 26 | +} | ||
| 27 | + | ||
| 13 | // HandleInfo 卡包信息 | 28 | // HandleInfo 卡包信息 |
| 14 | func HandleInfo(req *models.ReqCardHolderInfo) (code string, rsp models.RspCardHolderInfo) { | 29 | func HandleInfo(req *models.ReqCardHolderInfo) (code string, rsp models.RspCardHolderInfo) { |
| 15 | rsp = models.RspCardHolderInfo{} | 30 | rsp = models.RspCardHolderInfo{} |
service/cardholder/logic.go
| @@ -144,7 +144,5 @@ func GetInfo(gameData *dto.CardHolderData, conf *CardActivityConfig) models.Card | @@ -144,7 +144,5 @@ func GetInfo(gameData *dto.CardHolderData, conf *CardActivityConfig) models.Card | ||
| 144 | info.Album[i] = i2 | 144 | info.Album[i] = i2 |
| 145 | } | 145 | } |
| 146 | info.Round = gameData.Details.Round | 146 | info.Round = gameData.Details.Round |
| 147 | - info.StartTime = conf.Raw.StartTime | ||
| 148 | - info.EndTime = conf.Raw.EndTime | ||
| 149 | return info | 147 | return info |
| 150 | } | 148 | } |