|
@@ -144,16 +144,16 @@ func (l *GetSubSomeInfoLogic) GetSubSomeInfo(in *bxsubscribe.SomeInfoReq) (*bxsu
|
|
|
if o_buyset != nil {
|
|
|
resp.Data.Subsetinfo.Areacount = common.Int64All((*o_buyset)["areacount"])
|
|
|
}
|
|
|
- resp.Data.Subsetinfo.Key = freegetsubKey(subinfo)
|
|
|
+ resp.Data.Subsetinfo.Key = paygetsubKey(subinfo)
|
|
|
case MemberFlag:
|
|
|
resp.Data.Subsetinfo.Areacount = -1
|
|
|
if common.Int64All(subinfo["i_areacount"]) > 0 {
|
|
|
resp.Data.Subsetinfo.Areacount = common.Int64All(subinfo["i_areacount"]) // 单省版大会员
|
|
|
}
|
|
|
- resp.Data.Subsetinfo.Key = freegetsubKey(subinfo)
|
|
|
+ resp.Data.Subsetinfo.Key = paygetsubKey(subinfo)
|
|
|
case EntnicheFlag:
|
|
|
resp.Data.Subsetinfo.Areacount = -1
|
|
|
- resp.Data.Subsetinfo.Key = freegetsubKey(subinfo)
|
|
|
+ resp.Data.Subsetinfo.Key = paygetsubKey(subinfo)
|
|
|
}
|
|
|
}
|
|
|
registedate := common.Int64All((*data)["l_registedate"])
|
|
@@ -199,8 +199,13 @@ func paygetsubKey(subinfo map[string]interface{}) (arr []string) {
|
|
|
for i := 0; i < len(a_key); i++ {
|
|
|
a_keyi := common.ObjToMap(a_key[i])
|
|
|
if a_keyi != nil {
|
|
|
- a_keyiarr := (*a_keyi)["key"].([]interface{})
|
|
|
- arr = append(arr, strings.Join(common.ObjArrToStringArr(a_keyiarr), " "))
|
|
|
+ if a_keyiarr, ok := (*a_keyi)["key"].([]interface{}); ok {
|
|
|
+ s := strings.Join(common.ObjArrToStringArr(a_keyiarr), " ")
|
|
|
+ if a_appendkeyiarr, ok := (*a_keyi)["appendkey"].([]interface{}); ok {
|
|
|
+ s += " " + strings.Join(common.ObjArrToStringArr(a_appendkeyiarr), " ")
|
|
|
+ }
|
|
|
+ arr = append(arr, s)
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
return
|