Selaa lähdekoodia

Merge branch 'master' into hotfix/v1.0.3.1

lianbingjie 1 vuosi sitten
vanhempi
commit
02c6f093a1
3 muutettua tiedostoa jossa 18 lisäystä ja 17 poistoa
  1. 13 12
      common/src/qfw/util/jy/bigVipPower.go
  2. 1 1
      go.mod
  3. 4 4
      go.sum

+ 13 - 12
common/src/qfw/util/jy/bigVipPower.go

@@ -141,26 +141,27 @@ 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"))
-	userPower := BigVipBaseMsg{}
-	userId := qutil.ObjToString(session.Get("userId"))
+	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"])
+	userId := qutil.ObjToString(sessVal["userId"])
+	pccUserId := ""
 	if positionType == 0 {
-		userId = qutil.InterfaceToStr(session.Get("userId"))
+		pccUserId = userId
 	} else {
-		userId = qutil.InterfaceToStr(session.Get("mgoUserId"))
+		pccUserId = qutil.ObjToString(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)
+	log.Println("userId:", pccUserId, "-baseUserId:", baseUserId, "-accountId:", accountId, "-entId:", entId, "-positionType:", positionType, "-positionId:", positionId)
+	data := middleground.PowerCheckCenter.Check("10000", pccUserId, baseUserId, accountId, entId, positionType, positionId)
+	userPower := BigVipBaseMsg{}
 	if data != nil {
 		power := make(map[int]bool)
 		for _, v := range data.Member.MemberPowerList {
 			power[qutil.IntAll(v)] = true
 		}
-		userId := qutil.ObjToString(session.Get("userId"))
 		userPower = BigVipBaseMsg{
 			Status:       qutil.IntAll(data.Member.Status),    //大会员状态
 			Used:         data.Member.Used,                    //是否首次使用大会员

+ 1 - 1
go.mod

@@ -7,7 +7,7 @@ require (
 	app.yhyue.com/moapp/jybase v0.0.0-20230718012114-37013054344b
 	app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae
 	bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20230214091519-89a98c01ab0e
-	bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20230225125145-431a4f70093a
+	bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20231115092908-cb4608f3a96d
 	bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.8
 	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.15-0.20230925060020-8e4db0f1e13e
 	github.com/nsqio/go-nsq v1.1.0

+ 4 - 4
go.sum

@@ -11,8 +11,8 @@ app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae h1:6rDDaz6yxvE8vi
 app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae/go.mod h1:b0zZHev3gmJao1Fo+2Z2KPVjsuLOJVvVxf+kCnu9WkA=
 bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20230214091519-89a98c01ab0e h1:h+VEI3o1qC0jeCzkFGTrLI4f27cfa/W/y+0sXokWMgE=
 bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20230214091519-89a98c01ab0e/go.mod h1:7Xhygw0KBuL4h0G76FnFg4otQcA9bmOO0c8M0FCjAyQ=
-bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20230225125145-431a4f70093a h1:JX2jEMrbdLzXfVC/nTUvdFOkqNj5DUxkJFjl3XE1gyg=
-bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20230225125145-431a4f70093a/go.mod h1:5nimT8GJh46AyfeeDeyRlDQygMlO7TRM8Pwm41Gxemc=
+bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20231115092908-cb4608f3a96d h1:x17+SAYxlBChNWn2IS2eDWZlhZrxtgEWjlb1JF0946E=
+bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20231115092908-cb4608f3a96d/go.mod h1:rCCaOSWBYfQabf/yIvSVheSPtN2THnHeTl2J5/RrcuU=
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.8 h1:14Yxzutsej7LQe3jnN61wuRX9qjAZ4FtdWMA27ewQ3w=
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.8/go.mod h1:rRiGzKG4F/fmkNxXQCxrkxNWc8yf1SmW8qWCKfGIQSM=
 bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.15-0.20230925060020-8e4db0f1e13e h1:bncHHkJLqiDW1ZN6MVe+3bj3i0LxWgFkfqge6Gk7lB4=
@@ -1323,8 +1323,8 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-jygit.jydev.jianyu360.cn/ApplicationCenter/publicService v0.0.0-20230710093759-d9d6c68de8b1 h1:BItxi1gkQUs3sjxaBk6tc34fZWSO4hUSXcTM3PcnY4I=
-jygit.jydev.jianyu360.cn/ApplicationCenter/publicService v0.0.0-20230710093759-d9d6c68de8b1/go.mod h1:p/595fgbj4r6GhSJhHDpx3Ru1NkD5UASFL8OuIQw09E=
+jygit.jydev.jianyu360.cn/ApplicationCenter/publicService v0.0.0-20231017031425-45003ca9f35a h1:kwjO4pqB3gnNGrQ9aXyz6f8s9qXAUenPUDWip8gYR/Q=
+jygit.jydev.jianyu360.cn/ApplicationCenter/publicService v0.0.0-20231017031425-45003ca9f35a/go.mod h1:p/595fgbj4r6GhSJhHDpx3Ru1NkD5UASFL8OuIQw09E=
 k8s.io/api v0.22.9/go.mod h1:rcjO/FPOuvc3x7nQWx29UcDrFJMx82RxDob71ntNH4A=
 k8s.io/api v0.26.3 h1:emf74GIQMTik01Aum9dPP0gAypL8JTLl/lHa4V9RFSU=
 k8s.io/api v0.26.3/go.mod h1:PXsqwPMXBSBcL1lJ9CYDKy7kIReUydukS5JiRlxC3qE=