Merge branch 'feature/v1.0.4_ws' of moapp/jypkg into feature/v1.0.4

common/src/qfw/util/jy/bigVipPower.go

@@ -141,17 +141,18 @@ func ClearBigVipUserPower(userId string) bool {
 
 // 获取大会员个人基本信息
 func GetBigVipUserBaseMsg(session *httpsession.Session, middleground middleground.Middleground) *BigVipBaseMsg {
-	baseUserId := qutil.Int64All(session.Get("base_user_id"))
-	entId := qutil.Int64All(session.Get("entId"))
-	positionType := qutil.Int64All(session.Get("positionType"))
-	accountId := qutil.Int64All(session.Get("accountId"))
-	positionId := qutil.Int64All(session.Get("positionId"))
+	sessVal := session.GetMultiple()
+	baseUserId := qutil.Int64All(sessVal["base_user_id"])
+	entId := qutil.Int64All(sessVal["entId"])
+	positionType := qutil.Int64All(sessVal["positionType"])
+	accountId := qutil.Int64All(sessVal["accountId"])
+	positionId := qutil.Int64All(sessVal["positionId"])
 	userPower := BigVipBaseMsg{}
-	userId := qutil.ObjToString(session.Get("userId"))
+	userId := qutil.ObjToString(sessVal["userId"])
 	if positionType == 0 {
-		userId = qutil.InterfaceToStr(session.Get("userId"))
+		userId = qutil.InterfaceToStr(sessVal["userId"])
 	} else {
-		userId = qutil.InterfaceToStr(session.Get("mgoUserId"))
+		userId = qutil.InterfaceToStr(sessVal["mgoUserId"])
 	}
 	log.Println("userId:", userId, "-baseUserId:", baseUserId, "-accountId:", accountId, "-entId:", entId, "-positionType:", positionType, "-baseUserId:", baseUserId, "-accountId:", accountId, "-entId:", entId, "-positionType:", positionType, "-positionId:", positionId)
 	data := middleground.PowerCheckCenter.Check("10000", userId, baseUserId, accountId, entId, positionType, positionId)
@@ -160,7 +161,7 @@ func GetBigVipUserBaseMsg(session *httpsession.Session, middleground middlegroun
 		for _, v := range data.Member.MemberPowerList {
 			power[qutil.IntAll(v)] = true
 		}
-		userId := qutil.ObjToString(session.Get("userId"))
+		//userId := qutil.ObjToString(session.Get("userId"))
 		userPower = BigVipBaseMsg{
 			Status:       qutil.IntAll(data.Member.Status),    //大会员状态
 			Used:         data.Member.Used,                    //是否首次使用大会员