Commit e979a95a82cc45560fac3923bed1bc298006352c
1 parent
5ed82d23
Exists in
master
and in
1 other branch
fix: 代码规范
Showing
1 changed file
with
34 additions
and
34 deletions
Show diff stats
service/cardholder/handle.go
| ... | ... | @@ -15,14 +15,14 @@ func HandleInfo(req *models.ReqCardHolderInfo) (code string, rsp models.RspCardH |
| 15 | 15 | code = constd.RECODE_OK |
| 16 | 16 | |
| 17 | 17 | // 尝试更新配置 |
| 18 | - Config, hasConfig := TryUpdateConfig(req.GameID) | |
| 18 | + config, hasConfig := TryUpdateConfig(req.GameID) | |
| 19 | 19 | if !hasConfig { |
| 20 | 20 | code = constd.RECODE_MERGE_CARDHOLDER_NOTOPEN_ERROR |
| 21 | 21 | return |
| 22 | 22 | } |
| 23 | 23 | |
| 24 | 24 | // 读取游戏数据 |
| 25 | - gameData := LoadData(req.GameID, req.UID, Config.Id) | |
| 25 | + gameData := LoadData(req.GameID, req.UID, config.Id) | |
| 26 | 26 | |
| 27 | 27 | rsp.CardHolderInfo = gameData.GetInfo() |
| 28 | 28 | |
| ... | ... | @@ -35,19 +35,19 @@ func HandleGetNew(req *models.ReqCardHolderGetNew) (code string, rsp models.RspC |
| 35 | 35 | code = constd.RECODE_OK |
| 36 | 36 | |
| 37 | 37 | // 尝试更新配置 |
| 38 | - Config, hasConfig := TryUpdateConfig(req.GameID) | |
| 38 | + config, hasConfig := TryUpdateConfig(req.GameID) | |
| 39 | 39 | if !hasConfig { |
| 40 | 40 | code = constd.RECODE_MERGE_CARDHOLDER_NOTOPEN_ERROR |
| 41 | 41 | return |
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | // 检查活动状态 |
| 45 | - code = CheckStatus(Config) | |
| 45 | + code = CheckStatus(config) | |
| 46 | 46 | if code != constd.RECODE_OK { |
| 47 | 47 | return |
| 48 | 48 | } |
| 49 | 49 | // 检查卡包ID |
| 50 | - _, okCardholderConfig := Config.CardholderConfig[strconv.Itoa(req.Id)] | |
| 50 | + _, okCardholderConfig := config.CardholderConfig[strconv.Itoa(req.Id)] | |
| 51 | 51 | if !okCardholderConfig { |
| 52 | 52 | code = constd.RECODE_MERGE_CARDHOLDER_CARDHOLDERID_ERROR |
| 53 | 53 | return |
| ... | ... | @@ -59,9 +59,9 @@ func HandleGetNew(req *models.ReqCardHolderGetNew) (code string, rsp models.RspC |
| 59 | 59 | } |
| 60 | 60 | |
| 61 | 61 | // 读取游戏数据 |
| 62 | - gameData := LoadData(req.GameID, req.UID, Config.Id) | |
| 62 | + gameData := LoadData(req.GameID, req.UID, config.Id) | |
| 63 | 63 | // 检查游戏数据 轮次等 |
| 64 | - code = CheckGameData(gameData, Config) | |
| 64 | + code = CheckGameData(gameData, config) | |
| 65 | 65 | if code != constd.RECODE_OK { |
| 66 | 66 | return |
| 67 | 67 | } |
| ... | ... | @@ -73,7 +73,7 @@ func HandleGetNew(req *models.ReqCardHolderGetNew) (code string, rsp models.RspC |
| 73 | 73 | rsp.CardHolderInfo = gameData.GetInfo() |
| 74 | 74 | |
| 75 | 75 | // 记录日志 |
| 76 | - dto.SaveRecord(req.GameID, dto.NewCardHolderRecordGetNew(gameData.Uid, Config.Id, gameData.Details.Round, | |
| 76 | + dto.SaveRecord(req.GameID, dto.NewCardHolderRecordGetNew(gameData.Uid, config.Id, gameData.Details.Round, | |
| 77 | 77 | req.Id, req.Count)) |
| 78 | 78 | |
| 79 | 79 | return |
| ... | ... | @@ -85,28 +85,28 @@ func HandleOpen(req *models.ReqCardHolderOpen) (code string, rsp models.RspCardH |
| 85 | 85 | code = constd.RECODE_OK |
| 86 | 86 | |
| 87 | 87 | // 尝试更新配置 |
| 88 | - Config, hasConfig := TryUpdateConfig(req.GameID) | |
| 88 | + config, hasConfig := TryUpdateConfig(req.GameID) | |
| 89 | 89 | if !hasConfig { |
| 90 | 90 | code = constd.RECODE_MERGE_CARDHOLDER_NOTOPEN_ERROR |
| 91 | 91 | return |
| 92 | 92 | } |
| 93 | 93 | |
| 94 | 94 | // 检查活动状态 |
| 95 | - code = CheckStatus(Config) | |
| 95 | + code = CheckStatus(config) | |
| 96 | 96 | if code != constd.RECODE_OK { |
| 97 | 97 | return |
| 98 | 98 | } |
| 99 | 99 | // 检查卡包ID |
| 100 | - confCardholder, okCardholderConfig := Config.CardholderConfig[strconv.Itoa(req.Id)] | |
| 100 | + confCardholder, okCardholderConfig := config.CardholderConfig[strconv.Itoa(req.Id)] | |
| 101 | 101 | if !okCardholderConfig { |
| 102 | 102 | code = constd.RECODE_MERGE_CARDHOLDER_CARDHOLDERID_ERROR |
| 103 | 103 | return |
| 104 | 104 | } |
| 105 | 105 | |
| 106 | 106 | // 读取游戏数据 |
| 107 | - gameData := LoadData(req.GameID, req.UID, Config.Id) | |
| 107 | + gameData := LoadData(req.GameID, req.UID, config.Id) | |
| 108 | 108 | // 检查游戏数据 轮次等 |
| 109 | - code = CheckGameData(gameData, Config) | |
| 109 | + code = CheckGameData(gameData, config) | |
| 110 | 110 | if code != constd.RECODE_OK { |
| 111 | 111 | return |
| 112 | 112 | } |
| ... | ... | @@ -124,14 +124,14 @@ func HandleOpen(req *models.ReqCardHolderOpen) (code string, rsp models.RspCardH |
| 124 | 124 | //logs.Debug("wjwdbg 用户分组IDcohort:", cohort) |
| 125 | 125 | if confCardholder.IsNew != 0 { |
| 126 | 126 | // 如果是新卡包 按顺序查找数目最少的一张卡抽取 |
| 127 | - cardId := GetNewCard(gameData, Config) | |
| 127 | + cardId := GetNewCard(gameData, config) | |
| 128 | 128 | //logs.Debug("wjwdbg 抽取新卡ID:", cardId) |
| 129 | 129 | // 增加卡牌 |
| 130 | 130 | gameData.Details.Cards[cardId] += 1 |
| 131 | 131 | rsp.NewCards = append(rsp.NewCards, cardId) |
| 132 | 132 | } else { |
| 133 | 133 | getCardFunc := func(cardConfigId string) { |
| 134 | - confCardSequence, hasCardSequence := Config.FindCardSequenceConfig(cardConfigId, sequenceId, cohort) | |
| 134 | + confCardSequence, hasCardSequence := config.FindCardSequenceConfig(cardConfigId, sequenceId, cohort) | |
| 135 | 135 | if hasCardSequence { |
| 136 | 136 | combineId := CombineIdSequenceIdCohort(cardConfigId, sequenceId, cohort) |
| 137 | 137 | scale := gameData.Details.CardSequenceScales[combineId] |
| ... | ... | @@ -154,7 +154,7 @@ func HandleOpen(req *models.ReqCardHolderOpen) (code string, rsp models.RspCardH |
| 154 | 154 | // 非保底卡 |
| 155 | 155 | if confCardholder.NormalCardNumber > 0 { |
| 156 | 156 | count := confCardholder.NormalCardNumber |
| 157 | - confNormalCardStar, hasNormalCardStar := Config.FindNormalCardStarConfig(confCardholder.MinimumGuaranteeCardId, sequenceId, cohort) | |
| 157 | + confNormalCardStar, hasNormalCardStar := config.FindNormalCardStarConfig(confCardholder.MinimumGuaranteeCardId, sequenceId, cohort) | |
| 158 | 158 | if hasNormalCardStar { |
| 159 | 159 | combineIdStar := CombineIdSequenceIdCohort(confCardholder.MinimumGuaranteeCardId, sequenceId, cohort) |
| 160 | 160 | scaleStar := gameData.Details.StarSequenceScales[combineIdStar] |
| ... | ... | @@ -178,7 +178,7 @@ func HandleOpen(req *models.ReqCardHolderOpen) (code string, rsp models.RspCardH |
| 178 | 178 | SaveData(req.GameID, gameData) |
| 179 | 179 | |
| 180 | 180 | // 记录日志 |
| 181 | - dto.SaveRecord(req.GameID, dto.NewCardHolderRecordOpen(gameData.Uid, Config.Id, gameData.Details.Round, | |
| 181 | + dto.SaveRecord(req.GameID, dto.NewCardHolderRecordOpen(gameData.Uid, config.Id, gameData.Details.Round, | |
| 182 | 182 | req.Id, utjson.JsonString(rsp.NewCards))) |
| 183 | 183 | |
| 184 | 184 | //logs.Debug("wjwdbg 获取卡牌列表:", rsp.NewCards) |
| ... | ... | @@ -197,29 +197,29 @@ func HandleGetRewardAlbum(req *models.ReqCardHolderGetRewardAlbum) (code string, |
| 197 | 197 | code = constd.RECODE_OK |
| 198 | 198 | |
| 199 | 199 | // 尝试更新配置 |
| 200 | - Config, hasConfig := TryUpdateConfig(req.GameID) | |
| 200 | + config, hasConfig := TryUpdateConfig(req.GameID) | |
| 201 | 201 | if !hasConfig { |
| 202 | 202 | code = constd.RECODE_MERGE_CARDHOLDER_NOTOPEN_ERROR |
| 203 | 203 | return |
| 204 | 204 | } |
| 205 | 205 | |
| 206 | 206 | // 检查活动状态 |
| 207 | - code = CheckStatus(Config) | |
| 207 | + code = CheckStatus(config) | |
| 208 | 208 | if code != constd.RECODE_OK { |
| 209 | 209 | return |
| 210 | 210 | } |
| 211 | 211 | // 检查卡组ID |
| 212 | 212 | albumId := strconv.Itoa(req.Id) |
| 213 | - confAlbum, okAlbum := Config.AlbumConfig[albumId] | |
| 213 | + confAlbum, okAlbum := config.AlbumConfig[albumId] | |
| 214 | 214 | if !okAlbum { |
| 215 | 215 | code = constd.RECODE_MERGE_CARDHOLDER_ALBUMID_ERROR |
| 216 | 216 | return |
| 217 | 217 | } |
| 218 | 218 | |
| 219 | 219 | // 读取游戏数据 |
| 220 | - gameData := LoadData(req.GameID, req.UID, Config.Id) | |
| 220 | + gameData := LoadData(req.GameID, req.UID, config.Id) | |
| 221 | 221 | // 检查游戏数据 轮次等 |
| 222 | - code = CheckGameData(gameData, Config) | |
| 222 | + code = CheckGameData(gameData, config) | |
| 223 | 223 | if code != constd.RECODE_OK { |
| 224 | 224 | return |
| 225 | 225 | } |
| ... | ... | @@ -231,9 +231,9 @@ func HandleGetRewardAlbum(req *models.ReqCardHolderGetRewardAlbum) (code string, |
| 231 | 231 | return |
| 232 | 232 | } |
| 233 | 233 | // 检查卡组内卡是否集齐 |
| 234 | - for _, config := range Config.CardConfig { | |
| 235 | - if config.SetId == albumId { | |
| 236 | - count := gameData.Details.Cards[config.Id] | |
| 234 | + for _, conf := range config.CardConfig { | |
| 235 | + if conf.SetId == albumId { | |
| 236 | + count := gameData.Details.Cards[conf.Id] | |
| 237 | 237 | if count < 1 { |
| 238 | 238 | code = constd.RECODE_MERGE_CARDHOLDER_ALBUM_NOTFINISH_ERROR |
| 239 | 239 | return |
| ... | ... | @@ -253,7 +253,7 @@ func HandleGetRewardAlbum(req *models.ReqCardHolderGetRewardAlbum) (code string, |
| 253 | 253 | rsp.CardHolderInfo = gameData.GetInfo() |
| 254 | 254 | |
| 255 | 255 | // 记录日志 |
| 256 | - dto.SaveRecord(req.GameID, dto.NewCardHolderRecordRewardAlbum(gameData.Uid, Config.Id, gameData.Details.Round, | |
| 256 | + dto.SaveRecord(req.GameID, dto.NewCardHolderRecordRewardAlbum(gameData.Uid, config.Id, gameData.Details.Round, | |
| 257 | 257 | req.Id, rsp.Award)) |
| 258 | 258 | |
| 259 | 259 | return |
| ... | ... | @@ -265,30 +265,30 @@ func HandleGetRewardRound(req *models.ReqCardHolderGetRewardRound) (code string, |
| 265 | 265 | code = constd.RECODE_OK |
| 266 | 266 | |
| 267 | 267 | // 尝试更新配置 |
| 268 | - Config, hasConfig := TryUpdateConfig(req.GameID) | |
| 268 | + config, hasConfig := TryUpdateConfig(req.GameID) | |
| 269 | 269 | if !hasConfig { |
| 270 | 270 | code = constd.RECODE_MERGE_CARDHOLDER_NOTOPEN_ERROR |
| 271 | 271 | return |
| 272 | 272 | } |
| 273 | 273 | |
| 274 | 274 | // 检查活动状态 |
| 275 | - code = CheckStatus(Config) | |
| 275 | + code = CheckStatus(config) | |
| 276 | 276 | if code != constd.RECODE_OK { |
| 277 | 277 | return |
| 278 | 278 | } |
| 279 | 279 | |
| 280 | 280 | // 读取游戏数据 |
| 281 | - gameData := LoadData(req.GameID, req.UID, Config.Id) | |
| 281 | + gameData := LoadData(req.GameID, req.UID, config.Id) | |
| 282 | 282 | // 检查游戏数据 轮次等 |
| 283 | - code = CheckGameData(gameData, Config) | |
| 283 | + code = CheckGameData(gameData, config) | |
| 284 | 284 | if code != constd.RECODE_OK { |
| 285 | 285 | return |
| 286 | 286 | } |
| 287 | 287 | |
| 288 | 288 | // 判断所有卡组是否已经集齐 |
| 289 | 289 | // 检查卡组内卡是否集齐 |
| 290 | - for _, config := range Config.AlbumConfig { | |
| 291 | - count := gameData.Details.Album[config.SetId] | |
| 290 | + for _, conf := range config.AlbumConfig { | |
| 291 | + count := gameData.Details.Album[conf.SetId] | |
| 292 | 292 | if count < 1 { |
| 293 | 293 | code = constd.RECODE_MERGE_CARDHOLDER_ROUND_NOTFINISH_ERROR |
| 294 | 294 | return |
| ... | ... | @@ -298,10 +298,10 @@ func HandleGetRewardRound(req *models.ReqCardHolderGetRewardRound) (code string, |
| 298 | 298 | // 当前轮次 |
| 299 | 299 | round := gameData.Details.Round |
| 300 | 300 | // 返回奖励 |
| 301 | - rsp.Award = Config.Awards[uttype.IntToString(round)] | |
| 301 | + rsp.Award = config.Awards[uttype.IntToString(round)] | |
| 302 | 302 | |
| 303 | 303 | // 记录日志 |
| 304 | - dto.SaveRecord(req.GameID, dto.NewCardHolderRecordRewardRound(gameData.Uid, Config.Id, gameData.Details.Round, | |
| 304 | + dto.SaveRecord(req.GameID, dto.NewCardHolderRecordRewardRound(gameData.Uid, config.Id, gameData.Details.Round, | |
| 305 | 305 | rsp.Award)) |
| 306 | 306 | |
| 307 | 307 | // 处理轮次完成 | ... | ... |