From 6baf9cd19c309e3d792548a47c157a163e0a9cca Mon Sep 17 00:00:00 2001
From: eson <9673575+githubcontent@user.noreply.gitee.com>
Date: Tue, 29 Aug 2023 14:44:59 +0800
Subject: [PATCH] fix

---
 model/gmodel/fs_user_logic.go | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/model/gmodel/fs_user_logic.go b/model/gmodel/fs_user_logic.go
index 87c1c487..bf8050ca 100644
--- a/model/gmodel/fs_user_logic.go
+++ b/model/gmodel/fs_user_logic.go
@@ -141,12 +141,19 @@ func (u *FsUserModel) RegisterByFusen(ctx context.Context, token *auth.RegisterT
 	user := &FsUser{}
 
 	err := u.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
+		var err error
+		defer func() {
+			if err == gorm.ErrRecordNotFound {
+				err = nil
+			}
+		}()
 
 		UserTx := tx.Model(user)
-		err := UserTx.Where("email = ?", token.Email).Take(user).Error
+		err = UserTx.Where("email = ?", token.Email).Take(user).Error
 		if err != nil {
 			// 没有找到在数据库就创建注册
 			if err == gorm.ErrRecordNotFound {
+
 				FirstName := token.Extend["first_name"].(string)
 				LastName := token.Extend["last_name"].(string)
 				Resetaurant := token.Extend["resetaurant"].(string)
@@ -165,9 +172,8 @@ func (u *FsUserModel) RegisterByFusen(ctx context.Context, token *auth.RegisterT
 				}
 
 				if token.GuestId != 0 {
-
 					// 继承guest_id的资源表
-					return InheritGuestIdResource(tx, user.Id, token.GuestId, func(txResouce, txUserMaterial, txUserInfo *gorm.DB) error {
+					err = InheritGuestIdResource(tx, user.Id, token.GuestId, func(txResouce, txUserMaterial, txUserInfo *gorm.DB) error {
 						userProfile := &UserProfile{
 							FirstName:   FirstName,
 							LastName:    LastName,