From eb7861a65b1c674ea63e46aa793c18b94c3eaa52 Mon Sep 17 00:00:00 2001 From: jjxu <428192774@qq.com> Date: Tue, 18 Apr 2023 14:55:31 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=87=8D=E8=A6=81=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=EF=BC=9A=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE=E5=BA=93=E5=AF=B9?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E5=86=99=E4=B8=8D=E6=95=8F=E6=84=9F=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E7=9A=84=E9=82=80=E8=AF=B7=E5=85=B3=E7=B3=BB=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/model/invite.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/model/invite.go b/cmd/model/invite.go index c350b3b..85d5dd2 100644 --- a/cmd/model/invite.go +++ b/cmd/model/invite.go @@ -6,8 +6,8 @@ type Invite struct { UserId int32 `gorm:"column:user_id;comment:邀请人账号id"` UserInfo *User `gorm:"foreignKey:id;reference:UserId"` InvitedId int32 `gorm:"column:invited_id;default:0;comment:受邀请画家宝用户id"` - InviteCode string `gorm:"column:invite_code;type:varchar(191);uniqueIndex:invitecode_invitedcode;comment:邀请人的邀请码"` - InvitedCode string `gorm:"column:invited_code;type:varchar(191);uniqueIndex:invitecode_invitedcode;comment:受邀请人的邀请码"` + InviteCode string `gorm:"column:invite_code;type:varchar(191);comment:邀请人的邀请码"` + InvitedCode string `gorm:"column:invited_code;type:varchar(191);comment:受邀请人的邀请码"` } func (i Invite) TableName() string { From c8aaa4b3bbc1cf8ea73e05702eaa6370d27a19e5 Mon Sep 17 00:00:00 2001 From: jjxu <428192774@qq.com> Date: Tue, 18 Apr 2023 15:09:35 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=87=8D=E8=A6=81=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8D=E9=82=80=E8=AF=B7=E7=A0=81=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=A4=A7=E5=B0=8F=E5=86=99=E4=B8=8D=E6=95=8F=E6=84=9F?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/internal/controller/artistInfo_user.go | 8 ++++---- cmd/internal/dao/artistInfo_user.go | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cmd/internal/controller/artistInfo_user.go b/cmd/internal/controller/artistInfo_user.go index c109e2d..de81145 100644 --- a/cmd/internal/controller/artistInfo_user.go +++ b/cmd/internal/controller/artistInfo_user.go @@ -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 { diff --git a/cmd/internal/dao/artistInfo_user.go b/cmd/internal/dao/artistInfo_user.go index f19343e..55fcf66 100644 --- a/cmd/internal/dao/artistInfo_user.go +++ b/cmd/internal/dao/artistInfo_user.go @@ -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