|
@@ -409,14 +409,12 @@ func subvipBuySetFulsh(userId string, areaCount, buyerclasscount int, oldCitys *
|
|
|
//newFiled []int oldFiled map
|
|
|
func (this *vipSubscribeStruct) GetMergeNewBuyset(o_buyset map[string]interface{}) *SubvipBuySet {
|
|
|
if o_buyset["newcitys"] != nil { //新buyset
|
|
|
- log.Println("GetMergeNewBuyset==新buyset")
|
|
|
return &SubvipBuySet{
|
|
|
qutil.IntAll(o_buyset["areacount"]),
|
|
|
util.ConfirmIntArr(o_buyset["newcitys"].([]interface{})),
|
|
|
qutil.IntAll(o_buyset["buyerclasscount"]),
|
|
|
}
|
|
|
} else { //旧buyset
|
|
|
- log.Println("GetMergeNewBuyset==旧buyset")
|
|
|
areaCount := qutil.IntAll(o_buyset["areacount"])
|
|
|
buyerclasscount := qutil.IntAll(o_buyset["buyerclasscount"])
|
|
|
oldCitys := qutil.ObjToMap(o_buyset["citys"])
|