ZhangRongHong/bdrp-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

f

Browse Source
This commit is contained in:
liangzai
2026-04-18 12:05:21 +08:00
parent 55fcaf62dc
commit 957976db31
21 changed files with 331 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/main/api/internal/service/userService.go
View File

@@ -1,12 +1,12 @@
package service
import (
"context"
"bdrp-server/app/main/api/internal/config"
"bdrp-server/app/main/model"
"bdrp-server/common/ctxdata"
jwtx "bdrp-server/common/jwt"
"bdrp-server/common/xerr"
"context"
"database/sql"
"github.com/google/uuid"
@@ -210,6 +210,9 @@ func (s *UserService) TempUserBindUser(ctx context.Context, session sqlx.Session
// 使用事务上下文查询临时用户
userTemp, err := s.userTempModel.FindOne(ctx, claims.UserId)
if err != nil {
if errors.Is(err, model.ErrNotFound) {
return errors.Wrapf(xerr.NewErrCode(xerr.USER_TEMP_INVALID), "临时用户不存在, userId: %d", claims.UserId)
}
return err
}
@@ -236,6 +239,9 @@ func (s *UserService) TempUserBindUser(ctx context.Context, session sqlx.Session
// 重新获取最新的userTemp数据，确保版本号是最新的
latestUserTemp, err := s.userTempModel.FindOne(ctx, claims.UserId)
if err != nil {
if errors.Is(err, model.ErrNotFound) {
return errors.Wrapf(xerr.NewErrCode(xerr.USER_TEMP_INVALID), "临时用户不存在, userId: %d", claims.UserId)
}
return err
}
err = s.userTempModel.DeleteSoft(ctx, session, latestUserTemp)
@@ -261,6 +267,9 @@ func (s *UserService) TempUserBindUser(ctx context.Context, session sqlx.Session
// 重新获取最新的userTemp数据，确保版本号是最新的
latestUserTemp, err := s.userTempModel.FindOne(ctx, claims.UserId)
if err != nil {
if errors.Is(err, model.ErrNotFound) {
return errors.Wrapf(xerr.NewErrCode(xerr.USER_TEMP_INVALID), "临时用户不存在, userId: %d", claims.UserId)
}
return err
}
err = s.userTempModel.DeleteSoft(ctx, session, latestUserTemp)