diff --git a/controllers/cardholder.go b/controllers/cardholder.go index a80880c..7bb7445 100644 --- a/controllers/cardholder.go +++ b/controllers/cardholder.go @@ -10,6 +10,18 @@ type CardHolderController struct { BaseController } +// ActivityInfo 活动信息 +func (c *CardHolderController) ActivityInfo() { + req := new(models.ReqCardHolderActivityInfo) + if !c.GetPostData(req) { + return + } + + code, rsp := cardholder.HandleActivityInfo(req) + + c.RetRspCodeData(code, rsp) +} + // Info 卡包信息 func (c *CardHolderController) Info() { req := new(models.ReqCardHolderInfo) diff --git a/models/cardholder.go b/models/cardholder.go index 707ea75..f66632e 100644 --- a/models/cardholder.go +++ b/models/cardholder.go @@ -1,6 +1,20 @@ package models -// 海滩卡包 +// 卡包 + +// ReqCardHolderActivityInfo 请求 活动信息 +type ReqCardHolderActivityInfo struct { + BaseLoginInfo + BaseSign +} + +// RspCardHolderActivityInfo 返回 活动信息 +type RspCardHolderActivityInfo struct { + ActivityId int64 `form:"activity_id" json:"activity_id"` // 活动配置 0=无活动 + PreviewTime int64 `form:"preview_time" json:"preview_time"` // 活动预告时间 + StartTime int64 `form:"start_time" json:"start_time"` // 活动开始时间 + EndTime int64 `form:"end_time" json:"end_time"` // 活动结束时间 +} // CardHolderInfo 卡包信息 type CardHolderInfo struct { @@ -8,8 +22,6 @@ type CardHolderInfo struct { Cards map[int]int `form:"cards" json:"cards"` // 每张卡集了多少张 k=卡牌ID v=数量 Album map[string]int `form:"album" json:"album"` // 卡组奖励领取 k=卡组ID v=数量 Round int `form:"round" json:"round"` // 卡册当前轮次 - StartTime int64 `form:"start_time" json:"start_time"` // 活动开始时间 - EndTime int64 `form:"end_time" json:"end_time"` // 活动结束时间 } // ReqCardHolderInfo 请求 卡包信息 diff --git a/routers/router.go b/routers/router.go index c9c1eed..42f100e 100644 --- a/routers/router.go +++ b/routers/router.go @@ -11,6 +11,8 @@ func init() { prefix := "/3ad7e4ab95ae2249" // 海滩项目 + // 活动信息 + beego.Router(prefix+"/cardholder/activityinfo", &controllers.CardHolderController{}, "post:ActivityInfo") // 卡包信息 beego.Router(prefix+"/cardholder/info", &controllers.CardHolderController{}, "post:Info") // 获取卡包 diff --git a/service/cardholder/handle.go b/service/cardholder/handle.go index d943904..daf8b77 100644 --- a/service/cardholder/handle.go +++ b/service/cardholder/handle.go @@ -10,6 +10,21 @@ import ( "strconv" ) +// HandleActivityInfo 活动信息 +func HandleActivityInfo(req *models.ReqCardHolderActivityInfo) (code string, rsp models.RspCardHolderActivityInfo) { + rsp = models.RspCardHolderActivityInfo{} + code = constd.RECODE_OK + + // 尝试更新配置 + config, _ := TryUpdateConfig(req.GameID) + rsp.ActivityId = config.Id + rsp.PreviewTime = config.Raw.PreviewTime + rsp.StartTime = config.Raw.StartTime + rsp.EndTime = config.Raw.EndTime + + return +} + // HandleInfo 卡包信息 func HandleInfo(req *models.ReqCardHolderInfo) (code string, rsp models.RspCardHolderInfo) { rsp = models.RspCardHolderInfo{} diff --git a/service/cardholder/logic.go b/service/cardholder/logic.go index 379e218..ab9500b 100644 --- a/service/cardholder/logic.go +++ b/service/cardholder/logic.go @@ -144,7 +144,5 @@ func GetInfo(gameData *dto.CardHolderData, conf *CardActivityConfig) models.Card info.Album[i] = i2 } info.Round = gameData.Details.Round - info.StartTime = conf.Raw.StartTime - info.EndTime = conf.Raw.EndTime return info } -- libgit2 0.21.0