Commit c0cd7cded2f6adadcf435f1ece72f1a37d092d93
1 parent
92fe839f
Exists in
master
and in
1 other branch
feat:轮次
Showing
4 changed files
with
37 additions
and
7 deletions
Show diff stats
models/ht-cardholder.go
| @@ -7,7 +7,7 @@ type HtCardHolderInfo struct { | @@ -7,7 +7,7 @@ type HtCardHolderInfo struct { | ||
| 7 | Cardholder map[int]int `form:"cardholder" json:"cardholder"` // 卡包数量 k=卡包ID v=卡包数量 | 7 | Cardholder map[int]int `form:"cardholder" json:"cardholder"` // 卡包数量 k=卡包ID v=卡包数量 |
| 8 | Cards map[int]int `form:"cards" json:"cards"` // 每张卡集了多少张 k=卡牌ID v=数量 | 8 | Cards map[int]int `form:"cards" json:"cards"` // 每张卡集了多少张 k=卡牌ID v=数量 |
| 9 | Album map[string]int `form:"album" json:"album"` // 卡组奖励领取 k=卡组ID v=数量 | 9 | Album map[string]int `form:"album" json:"album"` // 卡组奖励领取 k=卡组ID v=数量 |
| 10 | - Round int `form:"round" json:"round"` // 卡册完成轮次 | 10 | + Round int `form:"round" json:"round"` // 卡册当前轮次 |
| 11 | } | 11 | } |
| 12 | 12 | ||
| 13 | // ReqHtCardHolderInfo 请求 卡包信息 | 13 | // ReqHtCardHolderInfo 请求 卡包信息 |
service/constd/index.go
| @@ -42,12 +42,13 @@ const ( | @@ -42,12 +42,13 @@ const ( | ||
| 42 | 42 | ||
| 43 | RECODE_MERGE_CARDHOLDER_NOTOPEN1_ERROR = "2101" | 43 | RECODE_MERGE_CARDHOLDER_NOTOPEN1_ERROR = "2101" |
| 44 | RECODE_MERGE_CARDHOLDER_NOTOPEN2_ERROR = "2102" | 44 | RECODE_MERGE_CARDHOLDER_NOTOPEN2_ERROR = "2102" |
| 45 | - RECODE_MERGE_CARDHOLDER_CARDHOLDERID_ERROR = "2103" | ||
| 46 | - RECODE_MERGE_CARDHOLDER_COUNTILLEGAL_ERROR = "2104" | ||
| 47 | - RECODE_MERGE_CARDHOLDER_CARDHOLDER_NOTENOUGH_ERROR = "2105" | ||
| 48 | - RECODE_MERGE_CARDHOLDER_ALBUMID_ERROR = "2106" | ||
| 49 | - RECODE_MERGE_CARDHOLDER_ALBUM_HASGOT_ERROR = "2107" | ||
| 50 | - RECODE_MERGE_CARDHOLDER_ALBUM_NOTFINISH_ERROR = "2108" | 45 | + RECODE_MERGE_CARDHOLDER_ROUNDFINISH_ERROR = "2103" |
| 46 | + RECODE_MERGE_CARDHOLDER_CARDHOLDERID_ERROR = "2104" | ||
| 47 | + RECODE_MERGE_CARDHOLDER_COUNTILLEGAL_ERROR = "2105" | ||
| 48 | + RECODE_MERGE_CARDHOLDER_CARDHOLDER_NOTENOUGH_ERROR = "2106" | ||
| 49 | + RECODE_MERGE_CARDHOLDER_ALBUMID_ERROR = "2107" | ||
| 50 | + RECODE_MERGE_CARDHOLDER_ALBUM_HASGOT_ERROR = "2108" | ||
| 51 | + RECODE_MERGE_CARDHOLDER_ALBUM_NOTFINISH_ERROR = "2109" | ||
| 51 | ) | 52 | ) |
| 52 | 53 | ||
| 53 | var recodeText = map[string]string{ | 54 | var recodeText = map[string]string{ |
| @@ -90,6 +91,7 @@ var recodeText = map[string]string{ | @@ -90,6 +91,7 @@ var recodeText = map[string]string{ | ||
| 90 | 91 | ||
| 91 | RECODE_MERGE_CARDHOLDER_NOTOPEN1_ERROR: "活动未开始", | 92 | RECODE_MERGE_CARDHOLDER_NOTOPEN1_ERROR: "活动未开始", |
| 92 | RECODE_MERGE_CARDHOLDER_NOTOPEN2_ERROR: "活动已结束", | 93 | RECODE_MERGE_CARDHOLDER_NOTOPEN2_ERROR: "活动已结束", |
| 94 | + RECODE_MERGE_CARDHOLDER_ROUNDFINISH_ERROR: "活动轮次已全部完成", | ||
| 93 | RECODE_MERGE_CARDHOLDER_CARDHOLDERID_ERROR: "卡包ID错误", | 95 | RECODE_MERGE_CARDHOLDER_CARDHOLDERID_ERROR: "卡包ID错误", |
| 94 | RECODE_MERGE_CARDHOLDER_COUNTILLEGAL_ERROR: "数目不合法", | 96 | RECODE_MERGE_CARDHOLDER_COUNTILLEGAL_ERROR: "数目不合法", |
| 95 | RECODE_MERGE_CARDHOLDER_CARDHOLDER_NOTENOUGH_ERROR: "卡包不足", | 97 | RECODE_MERGE_CARDHOLDER_CARDHOLDER_NOTENOUGH_ERROR: "卡包不足", |
service/ht-cardholder/handle.go
| @@ -50,6 +50,11 @@ func HandleGetNew(req *models.ReqHtCardHolderGetNew) (code string, rsp models.Rs | @@ -50,6 +50,11 @@ func HandleGetNew(req *models.ReqHtCardHolderGetNew) (code string, rsp models.Rs | ||
| 50 | 50 | ||
| 51 | // 读取游戏数据 | 51 | // 读取游戏数据 |
| 52 | gameData := LoadData(req.UID) | 52 | gameData := LoadData(req.UID) |
| 53 | + // 检查游戏数据 轮次等 | ||
| 54 | + code = CheckGameData(gameData) | ||
| 55 | + if code != constd.RECODE_OK { | ||
| 56 | + return | ||
| 57 | + } | ||
| 53 | 58 | ||
| 54 | gameData.Details.Cardholder[req.Id] += req.Count | 59 | gameData.Details.Cardholder[req.Id] += req.Count |
| 55 | SaveData(gameData) | 60 | SaveData(gameData) |
| @@ -82,6 +87,11 @@ func HandleOpen(req *models.ReqHtCardHolderOpen) (code string, rsp models.RspHtC | @@ -82,6 +87,11 @@ func HandleOpen(req *models.ReqHtCardHolderOpen) (code string, rsp models.RspHtC | ||
| 82 | 87 | ||
| 83 | // 读取游戏数据 | 88 | // 读取游戏数据 |
| 84 | gameData := LoadData(req.UID) | 89 | gameData := LoadData(req.UID) |
| 90 | + // 检查游戏数据 轮次等 | ||
| 91 | + code = CheckGameData(gameData) | ||
| 92 | + if code != constd.RECODE_OK { | ||
| 93 | + return | ||
| 94 | + } | ||
| 85 | 95 | ||
| 86 | // 判断卡包数目 | 96 | // 判断卡包数目 |
| 87 | countOld, _ := gameData.Details.Cardholder[req.Id] | 97 | countOld, _ := gameData.Details.Cardholder[req.Id] |
| @@ -182,6 +192,11 @@ func HandleGetRewardAlbum(req *models.ReqHtCardHolderGetRewardAlbum) (code strin | @@ -182,6 +192,11 @@ func HandleGetRewardAlbum(req *models.ReqHtCardHolderGetRewardAlbum) (code strin | ||
| 182 | 192 | ||
| 183 | // 读取游戏数据 | 193 | // 读取游戏数据 |
| 184 | gameData := LoadData(req.UID) | 194 | gameData := LoadData(req.UID) |
| 195 | + // 检查游戏数据 轮次等 | ||
| 196 | + code = CheckGameData(gameData) | ||
| 197 | + if code != constd.RECODE_OK { | ||
| 198 | + return | ||
| 199 | + } | ||
| 185 | 200 | ||
| 186 | // 是否已领过 | 201 | // 是否已领过 |
| 187 | countGot := gameData.Details.Album[albumId] | 202 | countGot := gameData.Details.Album[albumId] |
| @@ -237,6 +252,11 @@ func HandleGetRewardRound(req *models.ReqHtCardHolderGetRewardRound) (code strin | @@ -237,6 +252,11 @@ func HandleGetRewardRound(req *models.ReqHtCardHolderGetRewardRound) (code strin | ||
| 237 | // | 252 | // |
| 238 | //// 读取游戏数据 | 253 | //// 读取游戏数据 |
| 239 | //gameData := LoadData(req.UID) | 254 | //gameData := LoadData(req.UID) |
| 255 | + //// 检查游戏数据 轮次等 | ||
| 256 | + //code = CheckGameData(gameData) | ||
| 257 | + //if code != constd.RECODE_OK { | ||
| 258 | + // return | ||
| 259 | + //} | ||
| 240 | // | 260 | // |
| 241 | //// 是否已领过 | 261 | //// 是否已领过 |
| 242 | //countGot := gameData.Details.Album[albumId] | 262 | //countGot := gameData.Details.Album[albumId] |
service/ht-cardholder/logic.go
| @@ -69,6 +69,14 @@ func CheckStatus() string { | @@ -69,6 +69,14 @@ func CheckStatus() string { | ||
| 69 | return constd.RECODE_OK | 69 | return constd.RECODE_OK |
| 70 | } | 70 | } |
| 71 | 71 | ||
| 72 | +// CheckGameData 检查游戏数据 轮次等 | ||
| 73 | +func CheckGameData(d *dto.HtCardHolderData) string { | ||
| 74 | + if d.Details.Round > Config.Raw.Round { | ||
| 75 | + return constd.RECODE_MERGE_CARDHOLDER_ROUNDFINISH_ERROR | ||
| 76 | + } | ||
| 77 | + return constd.RECODE_OK | ||
| 78 | +} | ||
| 79 | + | ||
| 72 | // GetUserSequenceIdAndCohort 获取 用户序列组ID(sequenceId) 用户分组(cohort) | 80 | // GetUserSequenceIdAndCohort 获取 用户序列组ID(sequenceId) 用户分组(cohort) |
| 73 | func GetUserSequenceIdAndCohort(uid int64) (sequenceId, cohort string) { | 81 | func GetUserSequenceIdAndCohort(uid int64) (sequenceId, cohort string) { |
| 74 | // todo 这里后续要对接 | 82 | // todo 这里后续要对接 |