From 750ad8fb9a90c60d1983a1e11605060b83eeda87 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, 20 Nov 2020 12:04:24 +0800
Subject: [PATCH] test

---
 controllers/user2_controller.go | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/controllers/user2_controller.go b/controllers/user2_controller.go
index 94fd87435..fbce14af0 100644
--- a/controllers/user2_controller.go
+++ b/controllers/user2_controller.go
@@ -1,8 +1,6 @@
 package controllers
 
 import (
-	"fmt"
-
 	"git.rosy.net.cn/baseapi/platformapi/weixinapi"
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/auth2"
@@ -289,8 +287,8 @@ func (c *User2Controller) UpdateUserByMiniInfo() {
 }
 
 type UserInfoWithWeixin struct {
-	*weixinapi.MiniUserInfo
-	IsExist bool `json:"isExist"`
+	UserInfo *weixinapi.MiniUserInfo `json:"userInfo"`
+	IsExist  bool                    `json:"isExist"`
 }
 
 // @Title 根据小程序jsCode查询用户信息
@@ -310,27 +308,21 @@ func (c *User2Controller) GetUserByMiniInfo() {
 			if err = err2; err == nil {
 				var userInfo *weixinapi.MiniUserInfo
 				if err = utils.UnmarshalUseNumber([]byte(decryptedDataBase64), &userInfo); err == nil {
-					fmt.Println("1111", utils.Format4Output(userInfo, false))
 					var result *UserInfoWithWeixin
-					if err = utils.UnmarshalUseNumber(utils.MustMarshal(userInfo), &result); err == nil {
-						if userInfo.PhoneNumber != "" {
-							if user, err := dao.GetUserByID(dao.GetDB(), "mobile", userInfo.PhoneNumber); err == nil {
-								if user != nil {
-									result.IsExist = true
-								} else {
-									result.IsExist = false
-								}
-								fmt.Println("22222", utils.Format4Output(result, false))
-								retVal = result
+					result.UserInfo = userInfo
+					if userInfo.PhoneNumber != "" {
+						if user, err := dao.GetUserByID(dao.GetDB(), "mobile", userInfo.PhoneNumber); err == nil {
+							if user != nil {
+								result.IsExist = true
+							} else {
+								result.IsExist = false
 							}
+							retVal = result
 						}
-					} else {
-						fmt.Println(err)
 					}
 				}
 			}
 		}
-		fmt.Println("33333", utils.Format4Output(retVal, false))
 		return retVal, "", err
 	})
 }