修改了手机号登陆

api/controller/Login.go

@@ -47,6 +47,15 @@ func (r *Login) LoginPhone(c *gin.Context) {
 		}
 	}
 
+	// 开始事务
+	tx := global.Db.Begin()
+	defer func() {
+		if r := recover(); r != nil {
+			fmt.Println(r)
+			tx.Rollback()
+		}
+	}()
+
 	// 检测用户信息
 	userDao := dao.UserDao{}
 	maps := make(map[string]interface{})
@@ -54,15 +63,6 @@ func (r *Login) LoginPhone(c *gin.Context) {
 	user, _ := userDao.GetUser(maps)
 	// 新用户处理方式
 	if user == nil {
-		// 开始事务
-		tx := global.Db.Begin()
-		defer func() {
-			if r := recover(); r != nil {
-				fmt.Println(r)
-				tx.Rollback()
-			}
-		}()
-
 		// 头像
 		avatar := "www.baidu.com"
 
@@ -73,18 +73,18 @@ func (r *Login) LoginPhone(c *gin.Context) {
 		// 新增用户
 		user = &model.User{
 			UserName:         "",
+			AppIden:          "",
 			Mobile:           req.Mobile,
 			RegisterSource:   req.Source,
 			OpenId:           "",
 			UnionId:          "",
 			Age:              nil,
-			Sex:              0,
+			Sex:              nil,
 			Avatar:           avatar,
 			IsMember:         0,
 			MemberExpireDate: nil,
 			LoginIp:          loginIp,
 		}
-
 		loginAt := model.LocalTime(time.Now())
 		user.LoginAt = &loginAt
 
@@ -95,17 +95,61 @@ func (r *Login) LoginPhone(c *gin.Context) {
 			return
 		}
 
-		fmt.Println(user)
+		// 新增用户详情
+		userInfo := &model.UserInfo{
+			UserId:          user.UserId,
+			Height:          "",
+			Weight:          "",
+			NationId:        nil,
+			IsFamilyHistory: nil,
+			IsPregnant:      nil,
+			ExpectedDate:    nil,
+			ProvinceId:      nil,
+			Province:        "",
+			CityId:          nil,
+			City:            "",
+			CountyId:        nil,
+			County:          "",
+		}
+		userInfoDao := dao.UserInfoDao{}
+		userInfo, err = userInfoDao.AddUserInfo(tx, userInfo)
+		if err != nil {
+			tx.Rollback()
+			responses.FailWithMessage(err.Error(), c)
+			return
+		}
 
-		// 获取app用户信息
-		//var result *string
-		//if result == nil {
-		//	// 新增app用户信息
-		//}
+		// 处理app用户数据
+		userService := service.UserService{}
+		err = userService.HandleAppUserInfo(tx, user, userInfo)
+		if err != nil {
+			tx.Rollback()
+			responses.FailWithMessage(err.Error(), c)
+			return
+		}
 
-		tx.Commit()
+	} else {
+		// 获取用户详情数据
+		userInfoDao := dao.UserInfoDao{}
+		userInfo, err := userInfoDao.GetUserInfoByUserId(user.UserId)
+		if err != nil {
+			tx.Rollback()
+			responses.FailWithMessage(err.Error(), c)
+			return
+		}
+
+		// 处理app用户数据
+		userService := service.UserService{}
+		err = userService.HandleAppUserInfo(tx, user, userInfo)
+		if err != nil {
+			tx.Rollback()
+			responses.FailWithMessage(err.Error(), c)
+			return
+		}
 	}
 
+	tx.Commit()
+
 	// 下发token
 	token := &utils.Token{
 		UserId: fmt.Sprintf("%d", user.UserId),
@@ -118,6 +162,13 @@ func (r *Login) LoginPhone(c *gin.Context) {
 		return
 	}
 
+	// 获取用户数据
+	user, err = userDao.GetUser(maps)
+	if err != nil {
+		responses.FailWithMessage("登陆失败", c)
+		return
+	}
+
 	// 处理返回值
 	g := dto.LoginMobileDto(user)
 
@@ -194,7 +245,7 @@ func (r *Login) LoginWx(c *gin.Context) {
 			OpenId:           userInfo.OpenId,
 			UnionId:          userInfo.UnionId,
 			Age:              nil,
-			Sex:              userInfo.Sex,
+			Sex:              &userInfo.Sex,
 			Avatar:           avatar,
 			IsMember:         0,
 			MemberExpireDate: nil,