From 3e9186d691a91f87abe97d6e1f627dcee40b5445 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 25 Sep 2020 15:07:49 +0800
Subject: [PATCH] getslefinfo

---
 business/jxstore/cms/user2.go  | 16 ++++------------
 business/model/dao/dao_user.go | 21 +++++++++++++++++++++
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/business/jxstore/cms/user2.go b/business/jxstore/cms/user2.go
index 9be1c3c74..2279a321d 100644
--- a/business/jxstore/cms/user2.go
+++ b/business/jxstore/cms/user2.go
@@ -778,20 +778,12 @@ func LoadUserCart(ctx *jxcontext.Context, userID string, storeIDs []int) (cartIt
 	return cartItems, err
 }
 
-type GetSelfInfoResult struct {
-	User        *model.User
-	UserMembers []*model.UserMember
-}
-
-func GetSelfInfo(ctx *jxcontext.Context) (getSelfInfoResult *GetSelfInfoResult, err error) {
+func GetSelfInfo(ctx *jxcontext.Context) (getSelfInfoResult *dao.GetSelfInfoResult, err error) {
 	tokenInfo, err := auth2.GetTokenInfo(ctx.GetToken())
 	if err == nil {
-		if user, err2 := dao.GetUserByID(dao.GetDB(), "user_id", tokenInfo.GetID()); err2 == nil {
-			if userMembers, err3 := dao.GetUserMember(dao.GetDB(), user.UserID, "", 0, model.YES); err3 == nil {
-				getSelfInfoResult = &GetSelfInfoResult{
-					User:        user,
-					UserMembers: userMembers,
-				}
+		if getSelfInfoResult, err2 := dao.GetUserByIDWithMembers(dao.GetDB(), "user_id", tokenInfo.GetID()); err2 == nil {
+			if userMembers, err3 := dao.GetUserMember(dao.GetDB(), getSelfInfoResult.UserID, "", 0, model.YES); err3 == nil {
+				getSelfInfoResult.UserMembers = userMembers
 			} else {
 				err = err3
 			}
diff --git a/business/model/dao/dao_user.go b/business/model/dao/dao_user.go
index 456262c72..0a72ceffb 100644
--- a/business/model/dao/dao_user.go
+++ b/business/model/dao/dao_user.go
@@ -22,6 +22,11 @@ type UserDeliveryAddressEx struct {
 	DistrictName string `json:"districtName"`
 }
 
+type GetSelfInfoResult struct {
+	model.User
+	UserMembers []*model.UserMember `json:"userMembers"`
+}
+
 func GetUserByID(db *DaoDB, fieldName, fieldValue string) (user *model.User, err error) {
 	sql := fmt.Sprintf(`
 	SELECT *
@@ -38,6 +43,22 @@ func GetUserByID(db *DaoDB, fieldName, fieldValue string) (user *model.User, err
 	return user, err
 }
 
+func GetUserByIDWithMembers(db *DaoDB, fieldName, fieldValue string) (getSelfInfoResult *GetSelfInfoResult, err error) {
+	sql := fmt.Sprintf(`
+	SELECT *
+	FROM user t1
+	WHERE t1.deleted_at = ? AND t1.status = ? AND t1.%s = ?
+	`, fieldName)
+	sqlParams := []interface{}{
+		utils.DefaultTimeValue,
+		model.UserStatusNormal,
+		fieldValue,
+	}
+	// globals.SugarLogger.Debugf("GetUserByID sql:%s, sqlParams:%s", sql, utils.Format4Output(sqlParams, false))
+	err = GetRow(db, &getSelfInfoResult, sql, sqlParams...)
+	return getSelfInfoResult, err
+}
+
 func GetUsers(db *DaoDB, userType int, keyword string, userIDs, userID2s, mobiles []string, offset, pageSize int) (userList []*model.User, totalCount int, err error) {
 	offset = jxutils.FormalizePageOffset(offset)
 	pageSize = jxutils.FormalizePageSize(pageSize)