u

code/allapp/allapp-go-v3/internal/handle/auth.go

@@ -59,7 +59,6 @@ func handleThirdLogin(
 	loginType int16,
 	vo *types.LoginVO,
 ) error {
-
 	dbClient := db.New()
 
 	user, err := getUserByOpenID(dbClient, c, openid, loginType)
@@ -101,6 +100,29 @@ func handleThirdLogin(
 		return errors.WithStack(err)
 	}
 
+	familyMembers, err := dbClient.LoadData(
+		c.Context(),
+		"b_family_member",
+		"user_id = ?",
+		"",
+		[]string{"family_id"},
+		[]any{id},
+	)
+
+	if err != nil {
+		return errors.WithStack(err)
+	}
+
+	if len(familyMembers) == 0 {
+		vo.FamilyId = 0
+	} else {
+		familyMember := familyMembers[0]
+
+		familyId := toInt64(familyMember["family_id"])
+
+		vo.FamilyId = familyId
+	}
+
 	// ========= 返回 =========
 	vo.Token = token
 	vo.UserId = id
@@ -133,20 +155,20 @@ func registerUser(
 			"id":              userId,
 			"nickname":        nickname,
 			"avatar":          avatar,
-			"created_at":      "NOW()",
-			"updated_at":      "NOW()",
+			"create_time":     "NOW()",
+			"update_time":     "NOW()",
 			"last_login_time": "NOW()",
 		}); err != nil {
 			return err
 		}
 
 		if err := tx.Insert(c.Context(), "b_user_oauth", "id", map[string]any{
-			"id":         uniqueid.NextId(),
-			"user_id":    userId,
-			"type":       loginType,
-			"openid":     openid,
-			"created_at": "NOW()",
-			"updated_at": "NOW()",
+			"id":          uniqueid.NextId(),
+			"user_id":     userId,
+			"type":        loginType,
+			"openid":      openid,
+			"create_time": "NOW()",
+			"update_time": "NOW()",
 		}); err != nil {
 			return err
 		}
@@ -169,6 +191,7 @@ func registerUser(
 	vo.UserId = userId
 	vo.Nickname = nickname
 	vo.Avatar = avatar
+	vo.FamilyId = 0
 
 	return httpx.OK(c, vo)
 }