fusen/fusenapi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
eson 2023-08-29 14:57:09 +08:00
parent b9447dae4d
commit 2789fad2f1
1 changed files with 36 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
model/gmodel/fs_user_logic.go
View File

@ -52,9 +52,11 @@ func (u *FsUserModel) Transaction(ctx context.Context, fc func(tx *gorm.DB) erro
// 继承guest_id的资源表 // 继承guest_id的资源表
func InheritGuestIdResource(tx *gorm.DB, userId, guestId int64, afterDo func(txResouce *gorm.DB, txUserMaterial *gorm.DB, txUserInfo *gorm.DB) error) error { func InheritGuestIdResource(tx *gorm.DB, userId, guestId int64, afterDo func(txResouce *gorm.DB, txUserMaterial *gorm.DB, txUserInfo *gorm.DB) error) error {
var err error var err error
txRes := tx.Model(&FsResource{})
txUserMaterial := tx.Model(&FsUserMaterial{})
txUserInfo := tx.Model(&FsUserInfo{})
if guestId != 0 { if guestId != 0 {
// 继承guest_id的资源表 // 继承guest_id的资源表
txRes := tx.Model(&FsResource{})
err = txRes. err = txRes.
Where("guest_id = ?", guestId). Where("guest_id = ?", guestId).
UpdateColumn("user_id", userId).Error UpdateColumn("user_id", userId).Error
@ -62,7 +64,7 @@ func InheritGuestIdResource(tx *gorm.DB, userId, guestId int64, afterDo func(txR
if err != nil && err != gorm.ErrRecordNotFound { if err != nil && err != gorm.ErrRecordNotFound {
return err return err
} }
txUserMaterial := tx.Model(&FsUserMaterial{})
err = txUserMaterial. err = txUserMaterial.
Where("guest_id = ?", guestId). Where("guest_id = ?", guestId).
UpdateColumn("user_id", userId).Error UpdateColumn("user_id", userId).Error
@ -71,18 +73,17 @@ func InheritGuestIdResource(tx *gorm.DB, userId, guestId int64, afterDo func(txR
return err return err
} }
txUserInfo := tx.Model(&FsUserInfo{})
err = txUserInfo. err = txUserInfo.
Where("guest_id = ?", guestId). Where("guest_id = ?", guestId).
UpdateColumn("user_id", userId).Error UpdateColumn("user_id", userId).Error
if err != nil && err != gorm.ErrRecordNotFound { if err != nil && err != gorm.ErrRecordNotFound {
return err return err
} }
}
if afterDo != nil { if afterDo != nil {
return afterDo(txRes, txUserMaterial, txUserInfo) return afterDo(txRes, txUserMaterial, txUserInfo)
} }
}
return fmt.Errorf("guest_id must not be 0") return fmt.Errorf("guest_id must not be 0")
} }
@ -108,12 +109,9 @@ func (u *FsUserModel) RegisterByGoogleOAuth(ctx context.Context, token *auth.Reg
return err return err
} }
if token.GuestId != 0 {
// 继承guest_id的资源表 // 继承guest_id的资源表
return InheritGuestIdResource(tx, user.Id, token.GuestId, nil) return InheritGuestIdResource(tx, user.Id, token.GuestId, nil)
} }
return err
}
return err return err
} }
@ -170,7 +168,7 @@ func (u *FsUserModel) RegisterByFusen(ctx context.Context, token *auth.RegisterT
} }
logcontent += "create." logcontent += "create."
if token.GuestId != 0 {
// 继承guest_id的资源表 // 继承guest_id的资源表
err = 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{ userProfile := &UserProfile{
@ -200,7 +198,7 @@ func (u *FsUserModel) RegisterByFusen(ctx context.Context, token *auth.RegisterT
} }
return err return err
}
} }
return fmt.Errorf("the email had registered") return fmt.Errorf("the email had registered")