升级

src/jfw/modules/subscribepay/src/entity/subscribeVip.go

@@ -60,6 +60,7 @@ type VipSimpleMsg struct {
 	Addindustry        []string                `json:"addindustry"`        //新增订阅行业
 	Addareacount       *map[string]interface{} `json:"addareacount"`       //新增购买区域数量
 	Addbuyerclasscount int                     `json:"addbuyerclasscount"` //新增行业数量
+	Allarea            *map[string]interface{} `json:"allarea"`            //订单区域+新增区域
 	Cyclecount         int                     `json:"cyclecount"`         //日期数量
 	Cycleunit          int                     `json:"cycleunit"`          //日期单位
 	OrderType          int                     `json:"ordertype"`          //类型 1:订单 2:续费 3:立即升级 4:下月升级 5:即将到期（升降级）6:升级订单未生效再次升级
@@ -137,12 +138,8 @@ func (this *vipSubscribeStruct) PayCallBack(param *CallBackParam) bool {
 		flag = JyVipSubStruct.RenewSubVip(userid, qutil.ObjToString((*orderdata)["vip_endtime"]))
 	} else if vmsg.OrderType == 3 { //立即升级
 		flag = JyVipSubStruct.UpgradeSubVip(userid, vmsg, qutil.ObjToString((*orderdata)["vip_starttime"]), qutil.ObjToString((*orderdata)["vip_endtime"]), true, "no")
-		//	} else if vmsg.OrderType == 4 { //下月升级
-		//		flag = JyVipSubStruct.UpgradeSubVip(userid, vmsg, qutil.ObjToString((*orderdata)["vip_starttime"]), qutil.ObjToString((*orderdata)["vip_endtime"]), false, "no")
 	} else if vmsg.OrderType == 5 {
 		flag = JyVipSubStruct.UpgradeSubVip(userid, vmsg, qutil.ObjToString((*orderdata)["vip_starttime"]), qutil.ObjToString((*orderdata)["vip_endtime"]), false, "exprie")
-		//	} else if vmsg.OrderType == 6 { //下月升级未生效再次升级
-		//		flag = JyVipSubStruct.UpgradeSubVipTwo(userid, vmsg, qutil.ObjToString((*orderdata)["vip_endtime"]), false)
 	}
 	//支付成功后
 	if flag {
@@ -197,8 +194,8 @@ func (this *vipSubscribeStruct) UpgradeSubVip(userId string, vmsg VipSimpleMsg,
 		log.Println("%s格式化日期出错%s\n", userId, endTime)
 		return false
 	}
-	buyset := JyVipSubStruct.NewBuySet(vmsg.Area, vmsg.Industry)
 	if isNow {
+		buyset := JyVipSubStruct.NewBuySet(vmsg.Allarea, vmsg.Industry)
 		return util.MQFW.UpdateById("user", userId,
 			bson.M{"$set": bson.M{
 				"o_vipjy.o_area":       vmsg.Area,     //设置地区
@@ -223,7 +220,7 @@ func (this *vipSubscribeStruct) UpgradeSubVip(userId string, vmsg VipSimpleMsg,
 		//		} else {
 		//			effectTime = time.Date(time.Now().Year(), time.Now().Month()+1, 1, 0, 0, 0, 0, time.Local)
 		//		}
-
+		buyset := JyVipSubStruct.NewBuySet(vmsg.Area, vmsg.Industry)
 		return util.MQFW.Save("vip_upgrade",
 			bson.M{
 				"s_userid":     userId,            //试用设置地区

src/jfw/modules/subscribepay/src/service/vipSubscribePay.go

@@ -67,6 +67,7 @@ func (this *SubVipPayOrder) CreateOrder() {
 			nil,
 			nil,
 			0,
+			nil,
 			date_count,
 			date_unit,
 			orderType,

src/jfw/modules/subscribepay/src/service/vipSubscribeTrial.go

@@ -288,6 +288,7 @@ func (this *TrialOrder) TrialPay() {
 			nil,
 			nil,
 			0,
+			nil,
 			date_count,
 			date_unit,
 			0,