Merge branch 'feature/v4.10.2' of https://jygit.jydev.jianyu360.cn/qmx/jy into feature/v4.10.2

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

@@ -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,
-			"buyerAreaCount": num - filter.OldNum,
-			"finalAreaCount": num,
+			"addAreaCount":   addAreaCount,
+			"finalAreaCount": finalAreaCount,
 			"buy_type": func() int {
 				switch unit { //1月 2季 3年
 				case 1:

src/web/templates/pc/myOrder.html

@@ -1058,17 +1058,21 @@
                 }
               }
             }else if (v.newFilter&&(v.newFilter.buy_cycle||v.newFilter.give_cycle)){
+              var cycle = ''
               var cmap={1:"天",2:"月",3:"年",4:"季"}
               if (v.newFilter.buy_type==v.newFilter.give_type){
-                v.memberInfo.cycle = parseInt(v.newFilter.buy_cycle||0) +parseInt(v.newFilter.give_cycle||0) +cmap[v.newFilter.buy_type]
+                cycle = parseInt(v.newFilter.buy_cycle||0) +parseInt(v.newFilter.give_cycle||0) +cmap[v.newFilter.buy_type]
               }else{
                 if (v.newFilter.buy_cycle>0){
-                  v.memberInfo.cycle+=v.newFilter.buy_cycle+cmap[v.newFilter.buy_type]
+                  cycle+=v.newFilter.buy_cycle+cmap[v.newFilter.buy_type]
                 }
                 if (v.newFilter.give_cycle>0){
-                  v.memberInfo.cycle+=v.newFilter.give_cycle+cmap[v.newFilter.give_type]
+                  cycle+=v.newFilter.give_cycle+cmap[v.newFilter.give_type]
                 }
               }
+              if (cycle) {
+                v.memberInfo.cycle = cycle
+              }
             }
 
             // 超级订阅
@@ -1156,7 +1160,7 @@
                     vipInfo.cycle = parseInt(v.newFilter.buy_cycle||0) +parseInt(v.newFilter.give_cycle||0) +cmap[v.newFilter.buy_type]
                   }else{
                     if (v.newFilter.buy_cycle>0){
-                      vipInfo.cycle+=v.newFilter.buy_cycle+cmap[v.newFilter.buy_type]
+                      vipInfo.cycle=v.newFilter.buy_cycle+cmap[v.newFilter.buy_type]
                     }
                     if (v.newFilter.give_cycle>0){
                       vipInfo.cycle+=v.newFilter.give_cycle+cmap[v.newFilter.give_type]