Merge branch 'release/v4.9.16_ws' of qmx/jy into release/v4.9.16

src/jfw/modules/publicapply/src/activityday/dao/orderInfo.go

@@ -173,7 +173,7 @@ func (r *RaffleInfo) StartSubVip(vMsg entity.VipSimpleMsg, endTime string, statu
 		"l_vip_endtime":        end.Unix(),        //结束时间
 		"i_vip_status":         status,            //1试用 2正式
 		"i_vip_expire_tip":     0,                 //消息提示初始化
-		"o_vipjy.a_buyerclass": -1,
+		"o_vipjy.a_buyerclass": []string{},
 	}
 	if status > 0 {
 		//是否已经设置过行业

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

@@ -438,11 +438,17 @@ func (this *SalesCreateOrder) GetSubBuyMsg() {
 				delete((*renewList)[i], "_id")
 			}
 		}
+		var buyerclass []string
+		if (*o_vipjy)["a_buyerclass"] != nil {
+			if a_buyerclass, ok := (*o_vipjy)["a_buyerclass"].([]interface{}); ok {
+				buyerclass = qutil.ObjArrToStringArr(a_buyerclass)
+			}
+		}
 		bigPower := jy.GetBigVipUserBaseMsg(this.Session(), *config.Middleground)
 		return &entity.FuncResult{true, nil, map[string]interface{}{
 			"isTrial":         vipStatus == 1,
 			"area":            (*o_vipjy)["o_area"],
-			"industry":        (*o_vipjy)["a_buyerclass"],
+			"industry":        buyerclass,
 			"buyset":          buyset,
 			"renewList":       renewList,
 			"infotype":        (*o_vipjy)["a_infotype"],

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

@@ -178,11 +178,17 @@ func (this *SubscribeChange) GetSubBuyMsg() {
 				regionMap[k] = areaMap
 			}
 		}
+		var buyerclass []string
+		if (*o_vipjy)["a_buyerclass"] != nil {
+			if a_buyerclass, ok := (*o_vipjy)["a_buyerclass"].([]interface{}); ok {
+				buyerclass = qutil.ObjArrToStringArr(a_buyerclass)
+			}
+		}
 		return &entity.FuncResult{true, nil, map[string]interface{}{
 			"isTrial":         vipStatus == 1,
 			"area":            (*o_vipjy)["o_area"],
 			"regionMap":       regionMap,
-			"industry":        (*o_vipjy)["a_buyerclass"],
+			"industry":        buyerclass,
 			"buyset":          buyset,
 			"renewList":       renewList,
 			"infotype":        (*o_vipjy)["a_infotype"],