From ceb9c90afa07db843e7c4da5ef36bf5acf27a950 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 17 Sep 2020 14:25:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/user2.go | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/business/jxstore/cms/user2.go b/business/jxstore/cms/user2.go
index 6fdc80348..635f6f3cc 100644
--- a/business/jxstore/cms/user2.go
+++ b/business/jxstore/cms/user2.go
@@ -778,12 +778,28 @@ func LoadUserCart(ctx *jxcontext.Context, userID string, storeIDs []int) (cartIt
 	return cartItems, err
 }
 
-func GetSelfInfo(ctx *jxcontext.Context) (user *model.User, err error) {
+type GetSelfInfoResult struct {
+	User        *model.User
+	UserMembers []*model.UserMember
+}
+
+func GetSelfInfo(ctx *jxcontext.Context) (getSelfInfoResult *GetSelfInfoResult, err error) {
 	tokenInfo, err := auth2.GetTokenInfo(ctx.GetToken())
 	if err == nil {
-		user, err = dao.GetUserByID(dao.GetDB(), "user_id", tokenInfo.GetID())
+		if user, err2 := dao.GetUserByID(dao.GetDB(), "user_id", tokenInfo.GetID()); err2 == nil {
+			if userMembers, err3 := dao.GetUserMember(dao.GetDB(), user.UserID, ""); err3 == nil {
+				getSelfInfoResult = &GetSelfInfoResult{
+					User:        user,
+					UserMembers: userMembers,
+				}
+			} else {
+				err = err3
+			}
+		} else {
+			err = err2
+		}
 	}
-	return user, err
+	return getSelfInfoResult, err
 }
 
 func HandleUserWXRemark(db *dao.DaoDB, mobile string, mobileIsUerID bool) (err error) {