修改

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

@@ -202,16 +202,23 @@ func (this *vipSubscribeStruct) RenewSubVip(userId string, vmsg VipSimpleMsg, st
 		log.Printf("%s更新结束%d日期出错\n", userId, endTime.Unix())
 		return false
 	}
-	return util.MQFW.Save("vip_upgrade",
-		bson.M{
-			"s_userid":     userId,            //试用设置地区
-			"a_buyerclass": vmsg.Industry,     //试用设置行业
-			"o_area":       vmsg.Area,         //购买内容 城市、省份、行业数量
-			"l_validtime":  startTime.Unix(),  //生效时间
-			"l_createtime": time.Now().Unix(), //入库时间
-			"o_buyset":     vmsg.NewBuyset,    //购买内容数量
-			"i_isvalid":    0,                 //是否已经生效 0-未生效
-		}) != ""
+	value := bson.M{
+		"s_userid":     userId,            //试用设置地区
+		"a_buyerclass": vmsg.Industry,     //试用设置行业
+		"o_area":       vmsg.Area,         //购买内容 城市、省份、行业数量
+		"l_validtime":  startTime.Unix(),  //生效时间
+		"l_createtime": time.Now().Unix(), //入库时间
+		"o_buyset":     vmsg.NewBuyset,    //购买内容数量
+		"i_isvalid":    0,                 //是否已经生效 0-未生效
+	}
+	ok := util.MQFW.Save("vip_upgrade", value) != ""
+
+	if !ok {
+		log.Printf("%s续费保存续费表出错 %+v\n", userId, value)
+		return false
+	} else {
+		return true
+	}
 }
 
 //升级
@@ -232,15 +239,20 @@ func (this *vipSubscribeStruct) UpgradeSubVip(userId string, vmsg VipSimpleMsg,
 		log.Printf("%s vip_upgrade 更新失败\n", userId)
 		return false
 	}
-
-	return util.MQFW.UpdateById("user", userId,
-		bson.M{"$set": bson.M{
-			"o_vipjy.o_area":       vmsg.Area,     //设置地区
-			"o_vipjy.a_buyerclass": vmsg.Industry, //设置行业
-			"o_vipjy.o_buyset":     vmsg.NewBuyset,
-			"l_vip_endtime":        endTime.Unix(),
-			"i_vip_expire_tip":     0,
-		}})
+	value := bson.M{"$set": bson.M{
+		"o_vipjy.o_area":       vmsg.Area,     //设置地区
+		"o_vipjy.a_buyerclass": vmsg.Industry, //设置行业
+		"o_vipjy.o_buyset":     vmsg.NewBuyset,
+		"l_vip_endtime":        endTime.Unix(),
+		"i_vip_expire_tip":     0,
+	}}
+	ok := util.MQFW.UpdateById("user", userId, value)
+	if ok {
+		log.Printf("%s更新用户出错 %+v\n", userId, value)
+		return false
+	} else {
+		return true
+	}
 }
 
 //根据行业和地区 返回*SubvipBuySet
@@ -266,6 +278,7 @@ func (this *vipSubscribeStruct) NewBuySet(area *map[string]interface{}, industry
 		buyset.AreaCount = pCount //地区
 	} else {
 		buyset.AreaCount = -1 //全国
+		buyset.NewCitys = []int{}
 	}
 	//行业数量自动转换全行业
 	buyset.BuyerclassCount = len(industry)

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

@@ -117,7 +117,7 @@ func (this *SubscribeChange) SaveChange() {
 			industry,
 			date_count,
 			date_unit,
-			oldBuyset,
+			nil,
 			nil,
 			nil,
 			0,
@@ -130,6 +130,7 @@ func (this *SubscribeChange) SaveChange() {
 		if !needUpgrade && needRenew { //只续费，不升级
 			final_price = entity.JyVipSubStruct.GetSubVipPriceByBuySet(oldBuyset.NewCitys, oldBuyset.AreaCount, oldBuyset.BuyerclassCount, date_count, date_unit, true)
 			filter.OrderType = 5
+			filter.NewBuyset = oldBuyset
 			log.Println("续费", final_price)
 
 			//生效时间
@@ -147,6 +148,7 @@ func (this *SubscribeChange) SaveChange() {
 			}
 			final_price = totalPrice
 			filter.OrderType = 3
+			filter.OldBuyset = oldBuyset
 			filter.NewBuyset = upgradeBuyset
 			filter.UpgradeSubtotail = subtotail
 

src/web/staticres/vipsubscribe/js/vip_index_new.js

@@ -532,7 +532,7 @@ $(function () {
         var tmp1 = getAreaClassArr(reqData.oldArea);
         var tmp2 = getAreaClassArr(reqData.area);
         var areaNoChange = (JSON.stringify(tmp1[0].sort()) === JSON.stringify(tmp2[0].sort())) && (JSON.stringify(tmp1[1].sort()) === JSON.stringify(tmp2[1].sort()));
-        if (IndustryNoChange && areaNoChange) {
+        if (IndustryNoChange && areaNoChange && changeTime.length==0) {
             return
         }