Merge branch 'xjjdev'
This commit is contained in:
commit
c49275c1de
@ -171,7 +171,7 @@ func (a *ArtistInfoUserProvider) BindInviteInvitedAccount(ctx context.Context, i
|
|||||||
// 查询被邀请人是否存在
|
// 查询被邀请人是否存在
|
||||||
var invitedUser model.User
|
var invitedUser model.User
|
||||||
if in.InvitedUserId == 0 {
|
if in.InvitedUserId == 0 {
|
||||||
if err = db.DB.Debug().Where("invited_code = ?", in.InviteCode).First(&invitedUser).Error; err != nil {
|
if err = db.DB.Debug().Where("invited_code = ? OR id = ?", in.InviteCode, in.InvitedUserId).First(&invitedUser).Error; err != nil {
|
||||||
if err == gorm.ErrRecordNotFound {
|
if err == gorm.ErrRecordNotFound {
|
||||||
return nil, errors.New("被邀请人不存在")
|
return nil, errors.New("被邀请人不存在")
|
||||||
} else {
|
} else {
|
||||||
@ -196,9 +196,9 @@ func (a *ArtistInfoUserProvider) BindInviteInvitedAccount(ctx context.Context, i
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
data.UserId = int32(inviteUser.ID)
|
data.UserId = int32(inviteUser.ID)
|
||||||
data.InvitedId = in.InvitedUserId
|
data.InvitedId = int32(invitedUser.ID)
|
||||||
data.InvitedCode = in.InvitedCode
|
data.InvitedCode = invitedUser.InviteCode
|
||||||
data.InviteCode = in.InviteCode
|
data.InviteCode = inviteUser.InviteCode
|
||||||
//如果数据存更新刷新时间
|
//如果数据存更新刷新时间
|
||||||
if err = db.DB.Debug().Save(&data).Error; err != nil {
|
if err = db.DB.Debug().Save(&data).Error; err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@ -211,7 +211,7 @@ func (a *ArtistInfoUserProvider) BindInviteInvitedAccount(ctx context.Context, i
|
|||||||
}
|
}
|
||||||
if countData.ID == 0 {
|
if countData.ID == 0 {
|
||||||
countData = model.UserInvited{
|
countData = model.UserInvited{
|
||||||
UserId: int32(thisUser.ID),
|
UserId: int32(inviteUser.ID),
|
||||||
InvitedUserId: in.InvitedUserId, //受邀请人的画家宝用户id
|
InvitedUserId: in.InvitedUserId, //受邀请人的画家宝用户id
|
||||||
Count: 1,
|
Count: 1,
|
||||||
InvitedCode: in.InvitedCode,
|
InvitedCode: in.InvitedCode,
|
||||||
|
Loading…
Reference in New Issue
Block a user