Browse Source

feat:用户信息支持传参

zhangxinlei1996 3 năm trước cách đây
mục cha
commit
5318834b03

+ 19 - 18
api/internal/logic/getuserinfologic.go

@@ -31,7 +31,7 @@ func NewGetUserInfoLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetUs
 func (l *GetUserInfoLogic) GetUserInfo(req *types.UserReq) (resp *types.Resp, err error) {
 	// todo: add your logic here and delete this line
 	resp = &types.Resp{}
-	userId := req.UserId
+	userId := int64(req.UserId)
 	if req.Uid != "" {
 		//解密userid
 		decode_userid := encrypt.SE.Decode4Hex(req.Uid)
@@ -48,23 +48,24 @@ func (l *GetUserInfoLogic) GetUserInfo(req *types.UserReq) (resp *types.Resp, er
 		resp.Error_msg = res.ErrorMsg
 		resp.Error_code = -1
 		l.Error(fmt.Sprintf("%+v", req), res.ErrorMsg)
+	} else {
+		data := map[string]interface{}{
+			"start_time":      res.Data.StartTime,
+			"end_time":        res.Data.EndTime,
+			"area":            res.Data.Area,
+			"matchway":        res.Data.Matchway,
+			"items":           res.Data.Items,
+			"projectmatch":    res.Data.Projectmatch,
+			"infotype":        res.Data.Infotype,
+			"types":           res.SubscribeType, //订阅设置类型 f:免费订阅 v:超级订阅 m:大会员订阅 e:商机管理订阅
+			"vip_status":      res.VipStatus,
+			"member_status":   res.MemberStatus,
+			"entniche_status": res.EntnicheStatus,
+			"phone":           res.Phone,
+			"nickname":        res.Nickname,
+			"headimg":         res.Headimg,
+		}
+		resp.Data = data
 	}
-	data := map[string]interface{}{
-		"start_time":      res.Data.StartTime,
-		"end_time":        res.Data.EndTime,
-		"area":            res.Data.Area,
-		"matchway":        res.Data.Matchway,
-		"items":           res.Data.Items,
-		"projectmatch":    res.Data.Projectmatch,
-		"infotype":        res.Data.Infotype,
-		"types":           res.SubscribeType, //订阅设置类型 f:免费订阅 v:超级订阅 m:大会员订阅 e:商机管理订阅
-		"vip_status":      res.VipStatus,
-		"member_status":   res.MemberStatus,
-		"entniche_status": res.EntnicheStatus,
-		"phone":           res.Phone,
-		"nickname":        res.Nickname,
-		"headimg":         res.Headimg,
-	}
-	resp.Data = data
 	return
 }

+ 3 - 3
api/internal/types/types.go

@@ -188,9 +188,9 @@ type GetStatus struct {
 
 type UserReq struct {
 	AppId  string `header:"appId,default=10000"`
-	UserId int64  `header:"base_user_id,optional"` //session中的用户base_user_id
-	Uid    string `json:"uid,optional"`            //前端传的uid
-	Types  string `json:"types,optional"`          //类型,不传按默认规则获取 m大会员 e商机管理 v超级订阅 f免费订阅
+	UserId int    `header:"newUserId,optional"` //session中的用户base_user_id
+	Uid    string `json:"uid,optional"`         //前端传的uid
+	Types  string `json:"types,optional"`       //类型,不传按默认规则获取 m大会员 e商机管理 v超级订阅 f免费订阅
 }
 
 type EntUserReq struct {

+ 3 - 3
api/userCenter.api

@@ -201,9 +201,9 @@ type (
 
 	UserReq {
 		AppId  string `header:"appId,default=10000"`
-		UserId int64  `header:"base_user_id,optional"` //session中的用户base_user_id
-		Uid    string `json:"uid,optional"`            //前端传的uid
-		Types  string `json:"types,optional"`          //类型,不传按默认规则获取 m大会员 e商机管理 v超级订阅 f免费订阅
+		UserId int    `header:"newUserId,optional"` //session中的用户base_user_id
+		Uid    string `json:"uid,optional"`         //前端传的uid
+		Types  string `json:"types,optional"`       //类型,不传按默认规则获取 m大会员 e商机管理 v超级订阅 f免费订阅
 	}
 
 	EntUserReq {

+ 1 - 1
entity/subscribe.go

@@ -125,7 +125,7 @@ func (this *UserInfoReq) GetUserInfo() (ret map[string]interface{}, msg string)
 
 //获取mongodb user表相关数据
 func (this *UserInfoReq) userInfo() *map[string]interface{} {
-	data, ok := this.Mgo.FindOneByField("user", map[string]interface{}{"base_user_id": this.UserId}, `{"i_vip_status":1,"l_vip_starttime":1,"l_vip_endtime":1,"i_member_status":1,"i_member_starttime":1,"i_member_endtime":1,"o_jy":1,"o_vipjy":1,"o_member_jy":1,"s_phone":1,"s_m_phone":1}`)
+	data, ok := this.Mgo.FindOneByField("user", map[string]interface{}{"base_user_id": this.UserId}, `{"i_vip_status":1,"l_vip_starttime":1,"l_vip_endtime":1,"i_member_status":1,"i_member_starttime":1,"i_member_endtime":1,"o_jy":1,"o_vipjy":1,"o_member_jy":1,"s_phone":1,"s_m_phone":1,"s_nickname":1,"s_jyname":1,"s_headimageurl":1}`)
 	//data, ok := this.Mgo.FindById("user", this.UserId, `{"i_vip_status":1,"l_vip_starttime":1,"l_vip_endtime":1,"i_member_status":1,"i_member_starttime":1,"i_member_endtime":1,"o_jy":1,"o_vipjy":1,"o_member_jy":1,"s_phone":1,"s_m_phone":1,"s_nickname":1,"s_jyname":1,"s_headimageurl":1}`)
 	if ok && data != nil && len(*data) > 0 {
 		return data