Commit 526d1dc7d30d654cb6b9b49debf210bc229b2ba0
Exists in
master
and in
1 other branch
Merge branch 'master' into dev-wjw
Showing
2 changed files
with
10 additions
and
6 deletions
Show diff stats
configs/confcardholder/config.go
| @@ -144,7 +144,7 @@ type CardSequenceConfig struct { | @@ -144,7 +144,7 @@ type CardSequenceConfig struct { | ||
| 144 | 144 | ||
| 145 | // StarShopConfig 星星商店配置 | 145 | // StarShopConfig 星星商店配置 |
| 146 | type StarShopConfig struct { | 146 | type StarShopConfig struct { |
| 147 | - Id int `json:"id"` // ID | ||
| 148 | - NeedStarNumber int `json:"need_star_number"` // 需求星星数 | ||
| 149 | - CardBagIds []int `json:"card_bag_ids"` // 可换取的卡包ID {卡包类型,卡包ID,卡包数量} | 147 | + Id int `json:"id"` // ID |
| 148 | + NeedStarNumber int `json:"need_star_number"` // 需求星星数 | ||
| 149 | + CardBagIds string `json:"card_bag_ids"` // 可换取的卡包ID {卡包类型,卡包ID,卡包数量} | ||
| 150 | } | 150 | } |
service/cardholder/handle.go
| @@ -7,7 +7,9 @@ import ( | @@ -7,7 +7,9 @@ import ( | ||
| 7 | "apigame/util/util-lx/lxalilog" | 7 | "apigame/util/util-lx/lxalilog" |
| 8 | "apigame/util/util-lx/lxtime" | 8 | "apigame/util/util-lx/lxtime" |
| 9 | "apigame/util/utslice" | 9 | "apigame/util/utslice" |
| 10 | + "apigame/util/utstring" | ||
| 10 | "strconv" | 11 | "strconv" |
| 12 | + "strings" | ||
| 11 | ) | 13 | ) |
| 12 | 14 | ||
| 13 | // HandleGetConfig 活动配置 | 15 | // HandleGetConfig 活动配置 |
| @@ -179,13 +181,15 @@ func HandleShopExchange(req *models.ReqStarShopExchange) (code string, rsp model | @@ -179,13 +181,15 @@ func HandleShopExchange(req *models.ReqStarShopExchange) (code string, rsp model | ||
| 179 | } | 181 | } |
| 180 | 182 | ||
| 181 | // 判断配置 | 183 | // 判断配置 |
| 182 | - if len(confStarShop.CardBagIds) < 3 { | 184 | + cardBagIdsStr := strings.Split(confStarShop.CardBagIds, ",") |
| 185 | + cardBagIds := utstring.ListStringToListInt(cardBagIdsStr) | ||
| 186 | + if len(cardBagIds) < 3 { | ||
| 183 | lxalilog.Errors("StarShopConfig.CardBagIds error", confStarShop.Id) | 187 | lxalilog.Errors("StarShopConfig.CardBagIds error", confStarShop.Id) |
| 184 | code = code_msg.RECODE_MERGE_CONFIG_ERROR | 188 | code = code_msg.RECODE_MERGE_CONFIG_ERROR |
| 185 | return | 189 | return |
| 186 | } | 190 | } |
| 187 | - cardholderId := confStarShop.CardBagIds[1] | ||
| 188 | - cardholderCount := confStarShop.CardBagIds[2] | 191 | + cardholderId := cardBagIds[1] |
| 192 | + cardholderCount := cardBagIds[2] | ||
| 189 | if cardholderCount < 1 { | 193 | if cardholderCount < 1 { |
| 190 | lxalilog.Errors("StarShopConfig.CardBagIds error", confStarShop.Id) | 194 | lxalilog.Errors("StarShopConfig.CardBagIds error", confStarShop.Id) |
| 191 | code = code_msg.RECODE_MERGE_CONFIG_ERROR | 195 | code = code_msg.RECODE_MERGE_CONFIG_ERROR |