Merge branch 'dev2.8.5' of http://192.168.3.207:10080/qmx/jy into dev2.8.5

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

@@ -43,6 +43,7 @@ func (this *RenewUpgrade) GetBuyMsg() {
 		end := time.Unix(endtime, 0).Format("2006-01-02")
 		now := time.Unix(time.Now().Unix(), 0).Format("2006-01-02")
 		vipStatus := (*data)["i_vip_status"]
+		buyset := vipjy["o_buyset"]
 		//		isvalidOk := true
 
 		//		str, oks := util.MQFW.FindOne("vip_upgrade", bson.M{"s_userid": userId, "i_isvalid": 0})
@@ -63,6 +64,7 @@ func (this *RenewUpgrade) GetBuyMsg() {
 			"end":        end,
 			"now":        now,
 			"vipStatus":  vipStatus,
+			"buyset":     buyset,
 			//			"isvalidOk":  isvalidOk,
 		}
 		this.ServeJson(dataArr)
@@ -179,13 +181,29 @@ func (this *RenewUpgrade) RenewUpgradeCreateOrder() {
 		//			//			}
 		//			endTime = util.GetDATE(date_unit, date_count, startTime.Unix())
 		//		}
-		filter := entity.VipSimpleMsg{
-			area,
-			industry,
-			date_count,
-			date_unit,
-			orderType,
+		filter := entity.VipSimpleMsg{}
+		if pay_source == "Renew" {
+			filter = entity.VipSimpleMsg{
+				area,
+				industry,
+				nil,
+				nil,
+				date_count,
+				date_unit,
+				orderType,
+			}
+		} else if pay_source == "Upgrade" {
+			filter = entity.VipSimpleMsg{
+				allArea,
+				allIndustry,
+				area,
+				industry,
+				date_count,
+				date_unit,
+				orderType,
+			}
 		}
+
 		mog_id := entity.JyVipSubStruct.SaveSelectLog(userId, openId, &filter)
 		if mog_id == "" {
 			return &entity.FuncResult{false, errors.New("创建订单出错"), nil}

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

@@ -63,6 +63,8 @@ func (this *SubVipPayOrder) CreateOrder() {
 		filter := entity.VipSimpleMsg{
 			area,
 			industry,
+			nil,
+			nil,
 			date_count,
 			date_unit,
 			orderType,

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

@@ -284,6 +284,8 @@ func (this *TrialOrder) TrialPay() {
 		filter := entity.VipSimpleMsg{
 			area,
 			industry,
+			nil,
+			nil,
 			date_count,
 			date_unit,
 			0,