|
|
@@ -428,10 +428,11 @@ func memberSetMap(userId, waitEmpowerId int64, orderData map[string]interface{})
|
|
|
filterMap := common.ObjToMap(orderData["filter"])
|
|
|
comboId := common.IntAll((*filterMap)["comboId"])
|
|
|
level := common.If(comboId == 0, 5, comboId).(int)
|
|
|
+ level = common.If(gconv.Int((*filterMap)["finalAreaCount"]) == 1, 6, level).(int)
|
|
|
payCycle := month(common.IntAll((*filterMap)["buy_cycle"]), common.IntAll((*filterMap)["buy_type"])) + month(common.IntAll((*filterMap)["give_cycle"]), common.IntAll((*filterMap)["give_type"]))
|
|
|
|
|
|
//payCycle := common.IntAll((*filterMap)["cycle"])
|
|
|
- serversId := common.ObjToString((*filterMap)["serversId"])
|
|
|
+ serversId := common.ObjToString((*filterMap)["serviceIds"])
|
|
|
startTime := common.ObjToString(orderData["service_starttime"])
|
|
|
endTime := common.ObjToString(orderData["service_endtime"])
|
|
|
tmp := "2006-01-02 15:04:05"
|
|
|
@@ -443,7 +444,7 @@ func memberSetMap(userId, waitEmpowerId int64, orderData map[string]interface{})
|
|
|
dataType = 2
|
|
|
}
|
|
|
var (
|
|
|
- areaCount = common.IntAllDef((*filterMap)["areaCount"], -1)
|
|
|
+ areaCount = common.IntAllDef((*filterMap)["finalAreaCount"], -1)
|
|
|
area = common.If(areaCount > 0, map[string]interface{}{"北京": []string{}}, map[string]interface{}{}).(map[string]interface{})
|
|
|
)
|
|
|
|
