|
|
@@ -1327,7 +1327,11 @@ func areaPackOrder(m map[string]interface{}, userId string, session *httpsession
|
|
|
OriginalPrice: original_price,
|
|
|
}
|
|
|
//校验
|
|
|
- var service_type = 1
|
|
|
+ var (
|
|
|
+ service_type = 1
|
|
|
+ addAreaCount = num
|
|
|
+ finalAreaCount = num + 1
|
|
|
+ )
|
|
|
rdata := util.Compatible.Select(userId, `{"o_jy":1}`)
|
|
|
if rdata != nil && len(*rdata) > 0 {
|
|
|
ojy := qu.ObjToMap((*rdata)["o_jy"])
|
|
|
@@ -1361,6 +1365,7 @@ func areaPackOrder(m map[string]interface{}, userId string, session *httpsession
|
|
|
orderinfo.VipStartTime = FormatDate(&startTime, Date_Full_Layout)
|
|
|
orderinfo.VipEndTime = FormatDate(&endTime, Date_Full_Layout)
|
|
|
service_type = 2
|
|
|
+ addAreaCount = num - filter.OldNum
|
|
|
//升级
|
|
|
} else if filter.OrderType == 2 {
|
|
|
s := time.Unix(start, 0)
|
|
|
@@ -1371,8 +1376,11 @@ func areaPackOrder(m map[string]interface{}, userId string, session *httpsession
|
|
|
o_buyset_p := qu.ObjToMap((*ojy)["o_buyset_p"])
|
|
|
filter.OldNum = qu.IntAllDef((*o_buyset_p)["areacount"], 0)
|
|
|
service_type = 3
|
|
|
+
|
|
|
+ addAreaCount = 0
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
filterStr, _ := json.Marshal(filter)
|
|
|
orderinfo.Filter = string(filterStr)
|
|
|
orderinfo.OrderDetail = g.Map{
|
|
|
@@ -1388,8 +1396,8 @@ func areaPackOrder(m map[string]interface{}, userId string, session *httpsession
|
|
|
"is_master": 1,
|
|
|
"filter": gconv.String(g.Map{
|
|
|
"buy_cycle": 1,
|
|
|
- "addAreaCount": num - filter.OldNum,
|
|
|
- "finalAreaCount": num,
|
|
|
+ "addAreaCount": addAreaCount,
|
|
|
+ "finalAreaCount": finalAreaCount,
|
|
|
"buy_type": func() int {
|
|
|
switch unit { //1月 2季 3年
|
|
|
case 1:
|
