修改登录，新增openid判断

api/controller/Login.go

@@ -32,7 +32,7 @@ func (r *Login) Login(c *gin.Context) {
 		return
 	}
 
-	if req.OpenId == "" && req.Mobile == "" {
+	if req.Mobile == "" {
 		responses.FailWithMessage("登陆失败", c)
 		return
 	}
@@ -78,17 +78,7 @@ func (r *Login) Login(c *gin.Context) {
 	// 检测用户信息
 	userDao := dao.UserDao{}
 	maps := make(map[string]interface{})
-	if req.OpenId != "" {
-		maps["open_id"] = req.OpenId
-	}
-
-	if req.Mobile != "" {
 	maps["mobile"] = req.Mobile
-	}
-
-	if req.Uuid != "" {
-		maps["app_iden"] = req.Uuid
-	}
 	user, _ := userDao.GetUser(maps)
 	// 新用户处理方式
 	if user == nil {
@@ -164,6 +154,21 @@ func (r *Login) Login(c *gin.Context) {
 		}
 	}
 
+	// 处理用户openid
+	if req.OpenId != "" {
+		userData := make(map[string]interface{})
+		if req.OpenId != user.OpenId {
+			userData["open_id"] = req.OpenId
+		}
+
+		err := userDao.EditUserById(tx, user.UserId, userData)
+		if err != nil {
+			tx.Rollback()
+			responses.FailWithMessage(err.Error(), c)
+			return
+		}
+	}
+
 	// 处理app用户数据
 	userService := service.UserService{}
 	err = userService.GetAppUserInfo(tx, user, userInfo)

api/controller/User.go

@@ -219,6 +219,7 @@ func (r *User) GetUserCheck(c *gin.Context) {
 
 	if user.Mobile != "" {
 		g.MobileStatus = 1
+		g.Mobile = user.Mobile
 	}
 
 	if user.OpenId != "" {

api/dto/User.go

@@ -33,6 +33,7 @@ type UserDto struct {
 type UserCheckDto struct {
 	WxStatus     int    `json:"wx_status"`     // 微信绑定状态（0:否 1:是）
 	MobileStatus int    `json:"mobile_status"` // 手机号绑定状态（0:否 1:是）
+	Mobile       string `json:"mobile"`        // 手机号
 }
 
 // GetUserDto 详情