jjxu/fonchain-artistinfo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'xjjdev'

Browse Source
This commit is contained in:
徐俊杰 2023-04-18 15:10:07 +08:00
commit 655def2437
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/internal/controller/artistInfo_user.go
View File

@ -172,7 +172,7 @@ func (a *ArtistInfoUserProvider) GetUserMsg(ctx context.Context, req *artistInfo
func (a *ArtistInfoUserProvider) BindInviteInvitedAccount(ctx context.Context, in *artistInfoUser.BindInviteInvitedAccountRequest) (res *artistInfoUser.BindInviteInvitedAccountRespond, err error) {
// 查询被邀请人是否存在
var invitedUser model.User
if err = db.DB.Debug().Where("invited_code = ? OR id = ?", in.InvitedCode, in.InvitedUserId).First(&invitedUser).Error; err != nil {
if err = db.DB.Debug().Where("BINARY invited_code = ? OR id = ?", in.InvitedCode, in.InvitedUserId).First(&invitedUser).Error; err != nil {
if err == gorm.ErrRecordNotFound {
return nil, errors.New("被邀请人不存在")
} else {
@ -181,7 +181,7 @@ func (a *ArtistInfoUserProvider) BindInviteInvitedAccount(ctx context.Context, i
}
// 查询邀请人是否存在
var inviteUser model.User
if err = db.DB.Debug().Where("invited_code = ?", in.InviteCode).First(&inviteUser).Error; err != nil {
if err = db.DB.Debug().Where("BINARY invited_code = ?", in.InviteCode).First(&inviteUser).Error; err != nil {
if err == gorm.ErrRecordNotFound {
return nil, errors.New("邀请人不存在")
} else {
@ -192,7 +192,7 @@ func (a *ArtistInfoUserProvider) BindInviteInvitedAccount(ctx context.Context, i
fmt.Println("被邀请人userId:", invitedUser.ID)
var data model.Invite
// 受邀请者只能绑定一个邀请人
if err = db.DB.Debug().Where("invited_code = ?", in.InvitedCode).Find(&data).Error; err != nil {
if err = db.DB.Debug().Where("BINARY invited_code = ?", in.InvitedCode).Find(&data).Error; err != nil {
return nil, err
}
if data.ID == 0 {
@ -213,7 +213,7 @@ func (a *ArtistInfoUserProvider) BindInviteInvitedAccount(ctx context.Context, i
// 添加到次数统计
var countData model.UserInvited
if err = db.DB.Where("invite_code = ? AND invited_code =?", in.InviteCode, in.InvitedCode).Find(&countData).Error; err != nil {
if err = db.DB.Where("BINARY invite_code = ? AND BINARY invited_code = BINARY ?", in.InviteCode, in.InvitedCode).Find(&countData).Error; err != nil {
return nil, err
}
if countData.ID == 0 {

12
cmd/internal/dao/artistInfo_user.go
View File

@ -397,7 +397,7 @@ func CheckInvitedCode(req *artistInfoUser.CheckInvitedCodeRequest) (rep *artistI
rep = &artistInfoUser.GetUserRespond{}
// service := &artist.UserUpdateInfoService{}
var user model.User
if err = db.DB.First(&user, "invited_code = ?", req.InvitedCode).Error; err != nil {
if err = db.DB.First(&user, "invited_code invited_code = ?", req.InvitedCode).Error; err != nil {
zap.L().Error("get user info err", zap.Error(err))
return nil, err
}
@ -517,7 +517,7 @@ func FindUser(req *artistInfoUser.FindUserRequest) (rep *artistInfoUser.UserInfo
tx = tx.Where("mgmt_artist_id = ?", req.MgmtArtistId)
}
if req.InvitedCode != "" {
tx = tx.Where("invited_code = ?", req.InvitedCode)
tx = tx.Where("BINARY invited_code = ?", req.InvitedCode)
}
if req.MgmtArtistUid != "" {
tx = tx.Where("mgmt_artist_uid = ?", req.MgmtArtistUid)
@ -545,7 +545,7 @@ func FindUser(req *artistInfoUser.FindUserRequest) (rep *artistInfoUser.UserInfo
// var inviterCode = model.Invite{}
// var inviterAccount = &account.ListResponse{Data: []*account.AccountInfo{}}
// var inviterName string
// db.DB.Model(model.Invite{}).Where("invited_code = ?", data.InviteCode).First(&inviterCode)
// db.DB.Model(model.Invite{}).Where("BINARY invited_code = ?", data.InviteCode).First(&inviterCode)
// if inviterCode.InviteCode != "" {
// inviterAccount, err = service.AccountProvider.ListByIDs(context.Background(), &account.ListByIDsRequest{
// Page: 1,
@ -613,7 +613,7 @@ func FindUserList(req *artistInfoUser.FindUsersRequest) (rep []*artistInfoUser.U
Preload("RealNameInfo") //.Where("sys_user.mgmt_artist_uid!=''")
)
if req.InvitedCode != "" {
tx = tx.Where("invited_code = ?", req.InvitedCode)
tx = tx.Where("BINARY invited_code = ?", req.InvitedCode)
}
if req.MgmtAccountId != 0 {
tx = tx.Where("mgmt_acc_id = ?", req.MgmtAccountId)
@ -713,7 +713,7 @@ func GetViewUserList(req *artistInfoUser.FindUsersRequest) (resp []model.UserVie
tx = db.DB.Model(model.UserView{}).Order("created_at desc")
)
if req.InvitedCode != "" {
tx = tx.Where("invited_code = ?", req.InvitedCode)
tx = tx.Where("BINARY invited_code = ?", req.InvitedCode)
}
if req.MgmtArtistUid != "" {
tx = tx.Where("mgmt_artist_uid = ?", req.MgmtArtistUid)
@ -973,7 +973,7 @@ func CheckUserLockByArtistUid(artistUid string) (err error) {
func GetInviterInfo(inviterCode string) (result account.AccountInfo) {
//查找邀请关系
var inviteRelation = model.Invite{}
err := db.DB.Model(model.Invite{}).Where("invite_code = ?", inviterCode).Find(&inviteRelation).Error
err := db.DB.Model(model.Invite{}).Where("BINARY invite_code = ?", inviterCode).Find(&inviteRelation).Error
if err != nil {
fmt.Println("\n GetInviterInfo： 查询邀请人信息出错", err.Error())
return