From 4e5d45685d169dad3806c9b13cae72b6dc3a5a04 Mon Sep 17 00:00:00 2001 From: dorlolo <428192774@qq.com> Date: Thu, 16 Mar 2023 13:18:57 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E7=94=A8=E8=B4=A6=E5=8F=B7=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E6=8A=A5=E9=94=99as/sk=E9=AA=8C=E8=AF=81=E9=94=99?= =?UTF-8?q?=E8=AF=AF=EF=BC=8C=E6=8D=A2=E5=9B=9E=E5=8E=9F=E5=85=88=E7=9A=84?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/internal/dao/artistInfo_user.go | 183 +++++++++--------- .../dao/artistinfo_artshow_artistIndex.go | 1 + .../artistinfo_artshow_artistSupplement.go | 1 + cmd/model/invite.go | 4 +- cmd/model/user.go | 22 +-- cmd/model/user_invited.go | 2 +- 6 files changed, 112 insertions(+), 101 deletions(-) diff --git a/cmd/internal/dao/artistInfo_user.go b/cmd/internal/dao/artistInfo_user.go index 5dd05d8..5877f72 100644 --- a/cmd/internal/dao/artistInfo_user.go +++ b/cmd/internal/dao/artistInfo_user.go @@ -151,23 +151,24 @@ type InviteService struct { func CheckInvitedCodes(invitedCode string) (uint, error) { // 变更为通过账号服务验证邀请码 - // var user model.User - // //找到用户 - // if err := db.DB.Where("invited_code =?", invitedCode).Find(&user).Error; err != nil { - // return 0, err - // } - // if user.ID == 0 { - // return 0, errors.New("邀请码无效") - // } - // return uint(user.ID), nil - if res, err := service.AccountProvider.ListByIDs(context.Background(), &account.ListByIDsRequest{ - Page: 1, - PageSize: 1, - InvitationCode: []string{invitedCode}, - }); err != nil && res != nil && len(res.Data) > 0 { - return uint(res.Data[0].ID), nil + var user model.User + //找到用户 + if err := db.DB.Where("invited_code =?", invitedCode).Find(&user).Error; err != nil { + return 0, err } - return 0, errors.New("邀请码无效") + if user.ID == 0 { + return 0, errors.New("邀请码无效") + } + return uint(user.ID), nil + // todo 无法通过账号服务获取邀请码信息 + // if res, err := service.AccountProvider.ListByIDs(context.Background(), &account.ListByIDsRequest{ + // Page: 1, + // PageSize: 1, + // InvitationCode: []string{invitedCode}, + // }); err != nil && res != nil && len(res.Data) > 0 { + // return uint(res.Data[0].ID), nil + // } + // return 0, errors.New("邀请码无效") } func GetUser(req *artistInfoUser.GetUserRequest) (rep *artistInfoUser.GetUserRespond, err error) { @@ -438,7 +439,7 @@ func FindUser(req *artistInfoUser.FindUserRequest) (rep *artistInfoUser.UserInfo fmt.Println("FindUser 11111111111") rep = &artistInfoUser.UserInfo{} var data = model.User{} - var tx = db.DB.Model(model.User{}).Preload("RealNameInfo") //.Preload("InvitedBy.UserInfo.RealNameInfo") + var tx = db.DB.Model(model.User{}).Preload("RealNameInfo").Preload("InvitedBy.UserInfo.RealNameInfo") if req.MgmtAccId != 0 { tx = tx.Where("mgmt_acc_id = ?", req.MgmtAccId) } @@ -459,32 +460,36 @@ func FindUser(req *artistInfoUser.FindUserRequest) (rep *artistInfoUser.UserInfo data.RealNameInfo = &model.RealName{} } // 邀请人的查询变更为通过账号服务查询 - // if data.InvitedBy == nil { - // data.InvitedBy = &model.Invite{} - // } - // var invitedName string - // if data.InvitedBy != nil && data.InvitedBy.UserInfo != nil && data.InvitedBy.UserInfo.RealNameInfo != nil { - // invitedName = data.InvitedBy.UserInfo.RealNameInfo.Name - // } - //查询邀请人 - 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) - if inviterCode.InviteCode != "" { - inviterAccount, err = service.AccountProvider.ListByIDs(context.Background(), &account.ListByIDsRequest{ - Page: 1, - PageSize: 1, - InvitationCode: []string{inviterCode.InviteCode}, - }) - if err != nil { - fmt.Println("AccountProvider.ListByID error", err.Error()) - return nil, err - } - if len(inviterAccount.Data) > 0 { - inviterName = inviterAccount.Data[0].RealName - } + if data.InvitedBy == nil { + data.InvitedBy = &model.Invite{} } + var inviterName string + var inviterCode string + if data.InvitedBy != nil { + inviterCode = data.InvitedBy.InviteCode + } + if data.InvitedBy != nil && data.InvitedBy.UserInfo != nil && data.InvitedBy.UserInfo.RealNameInfo != nil { + inviterName = data.InvitedBy.UserInfo.RealNameInfo.Name + } + //查询邀请人 无法通过账号服务进行查询，密码验证错误 + // 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) + // if inviterCode.InviteCode != "" { + // inviterAccount, err = service.AccountProvider.ListByIDs(context.Background(), &account.ListByIDsRequest{ + // Page: 1, + // PageSize: 1, + // InvitationCode: []string{inviterCode.InviteCode}, + // }) + // if err != nil { + // fmt.Println("AccountProvider.ListByID error", err.Error()) + // return nil, err + // } + // if len(inviterAccount.Data) > 0 { + // inviterName = inviterAccount.Data[0].RealName + // } + // } service.AccountProvider.Info(context.Background(), &account.InfoRequest{}) rep = &artistInfoUser.UserInfo{ Id: data.ID, @@ -495,8 +500,8 @@ func FindUser(req *artistInfoUser.FindUserRequest) (rep *artistInfoUser.UserInfo MgmtArtistId: data.MgmtArtistId, MgmtArtistUid: data.MgmtArtistUid, TelNum: data.TelNum, - InviterCode: inviterCode.InviteCode, //邀请人的邀请码，不是用户个人邀请码 - InviterName: inviterName, //邀请人的姓名 + InviterCode: inviterCode, //邀请人的邀请码，不是用户个人邀请码 + InviterName: inviterName, //邀请人的姓名 IsRealName: data.IsRealName, RealNameId: data.RealNameId, RealName: &artistInfoUser.RealNameInfo{ @@ -586,10 +591,13 @@ func FindUserList(req *artistInfoUser.FindUsersRequest) (rep []*artistInfoUser.U // invitedName = "无" // } var inviterName, inviterCode string - // 查询邀请人信息 - inviterInfo := GetInviterInfo(v.InviteCode) + // 查询邀请人信息,调用账号服务接口报错 as/sk 错误，换原先的方法 + // inviterInfo := GetInviterInfo(v.InviteCode) + // inviterName = inviterInfo.RealName + if v.RealNameInfo != nil { + inviterName = v.RealNameInfo.Name + } inviterCode = v.InviteCode - inviterName = inviterInfo.RealName rep = append(rep, &artistInfoUser.UserInfo{ Id: v.ID, DeletedAt: int64(v.DeletedAt), @@ -894,47 +902,48 @@ func GetInviterInfo(inviterCode string) (result account.AccountInfo) { fmt.Println("\n GetInviterInfo： 查询邀请人信息出错", err.Error()) return } + // todo 接口调用报错 as/ak错误 //查询邀请人信息 - res, err := service.AccountProvider.ListByIDs(context.Background(), &account.ListByIDsRequest{ - Page: 1, - PageSize: 1, - InvitationCode: []string{inviteRelation.InviteCode}, - }) - if err != nil { - fmt.Println("\n GetInviterInfo 查询邀请人信息出错 service.AccountProvider.ListByIDs Error", err.Error()) - return - } - if res != nil && len(res.Data) > 0 { - result = account.AccountInfo{ - ID: res.Data[0].ID, - Account: res.Data[0].Account, - NickName: res.Data[0].NickName, - Type: res.Data[0].Type, - TelNum: res.Data[0].TelNum, - Status: res.Data[0].Status, - Avatar: res.Data[0].Avatar, - CreateAt: res.Data[0].CreateAt, - RealNameID: res.Data[0].RealNameID, - RealName: res.Data[0].RealName, - IDNum: res.Data[0].IDNum, - MnemonicWords: res.Data[0].MnemonicWords, - IsNeedChange: res.Data[0].IsNeedChange, - EnterDate: res.Data[0].EnterDate, - WorkYear: res.Data[0].WorkYear, - Domain: res.Data[0].Domain, - Extend: res.Data[0].Extend, - JobNum: res.Data[0].JobNum, - BirthDate: res.Data[0].BirthDate, - Age: res.Data[0].Age, - Sex: res.Data[0].Sex, - Title: res.Data[0].Title, - Departments: res.Data[0].Departments, - Ip: res.Data[0].Ip, - LoginDate: res.Data[0].LoginDate, - InvitationCode: res.Data[0].InvitationCode, - } - return - } + // res, err := service.AccountProvider.ListByIDs(context.Background(), &account.ListByIDsRequest{ + // Page: 1, + // PageSize: 1, + // InvitationCode: []string{inviteRelation.InviteCode}, + // }) + // if err != nil { + // fmt.Println("\n GetInviterInfo 查询邀请人信息出错 service.AccountProvider.ListByIDs Error", err.Error()) + // return + // } + // if res != nil && len(res.Data) > 0 { + // result = account.AccountInfo{ + // ID: res.Data[0].ID, + // Account: res.Data[0].Account, + // NickName: res.Data[0].NickName, + // Type: res.Data[0].Type, + // TelNum: res.Data[0].TelNum, + // Status: res.Data[0].Status, + // Avatar: res.Data[0].Avatar, + // CreateAt: res.Data[0].CreateAt, + // RealNameID: res.Data[0].RealNameID, + // RealName: res.Data[0].RealName, + // IDNum: res.Data[0].IDNum, + // MnemonicWords: res.Data[0].MnemonicWords, + // IsNeedChange: res.Data[0].IsNeedChange, + // EnterDate: res.Data[0].EnterDate, + // WorkYear: res.Data[0].WorkYear, + // Domain: res.Data[0].Domain, + // Extend: res.Data[0].Extend, + // JobNum: res.Data[0].JobNum, + // BirthDate: res.Data[0].BirthDate, + // Age: res.Data[0].Age, + // Sex: res.Data[0].Sex, + // Title: res.Data[0].Title, + // Departments: res.Data[0].Departments, + // Ip: res.Data[0].Ip, + // LoginDate: res.Data[0].LoginDate, + // InvitationCode: res.Data[0].InvitationCode, + // } + // return + // } return } diff --git a/cmd/internal/dao/artistinfo_artshow_artistIndex.go b/cmd/internal/dao/artistinfo_artshow_artistIndex.go index 9b3d022..099fe1e 100644 --- a/cmd/internal/dao/artistinfo_artshow_artistIndex.go +++ b/cmd/internal/dao/artistinfo_artshow_artistIndex.go @@ -9,6 +9,7 @@ package dao import ( "errors" "fmt" + "github.com/fonchain/fonchain-artistinfo/cmd/model" "github.com/fonchain/fonchain-artistinfo/pb/artistinfoArtshow" db "github.com/fonchain/fonchain-artistinfo/pkg/db" diff --git a/cmd/internal/dao/artistinfo_artshow_artistSupplement.go b/cmd/internal/dao/artistinfo_artshow_artistSupplement.go index 754fb46..d0d0721 100644 --- a/cmd/internal/dao/artistinfo_artshow_artistSupplement.go +++ b/cmd/internal/dao/artistinfo_artshow_artistSupplement.go @@ -9,6 +9,7 @@ package dao import ( "errors" "fmt" + "github.com/fonchain/fonchain-artistinfo/cmd/model" "github.com/fonchain/fonchain-artistinfo/pb/artistinfoArtshow" db "github.com/fonchain/fonchain-artistinfo/pkg/db" diff --git a/cmd/model/invite.go b/cmd/model/invite.go index c8e4279..85d5dd2 100644 --- a/cmd/model/invite.go +++ b/cmd/model/invite.go @@ -3,8 +3,8 @@ package model // User 用户模型 type Invite struct { Model - // UserId int32 `gorm:"column:user_id;comment:邀请人账号id"` - // UserInfo *User `gorm:"foreignKey:id;reference:UserId"` + 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);comment:邀请人的邀请码"` InvitedCode string `gorm:"column:invited_code;type:varchar(191);comment:受邀请人的邀请码"` diff --git a/cmd/model/user.go b/cmd/model/user.go index 856a99f..9a00b71 100644 --- a/cmd/model/user.go +++ b/cmd/model/user.go @@ -3,17 +3,17 @@ package model // User 用户模型 type User struct { Model - MgmtAccId int64 `gorm:"column:mgmt_acc_id;not null;uniqueIndex:mgmt_acc_mgmt_artist_idx;comment:账号id"` - MgmtArtistId int64 `gorm:"column:mgmt_artist_id;not null;uniqueIndex:mgmt_acc_mgmt_artist_idx;comment:艺术家id"` - MgmtArtistUid string `gorm:"column:mgmt_artist_uid;type:varchar(256);comment:艺术家uid"` - TelNum string `gorm:"column:tel_num;type:varchar(20);not null;电话号码"` - InviteCode string `gorm:"column:invited_code;type:varchar(16);default:'';comment:个人邀请码"` - // InvitedBy *Invite `gorm:"foreignKey:InvitedId"` //邀请者的相关信息,弃用，因为此处不存储经纪人数据 - Account string `gorm:"column:account;varchar(191);comment:账号"` - CertificateNum string `gorm:"column:certificate_num;type:varchar(16);comment:中美协会证书编号"` - CertificateImg string `gorm:"column:certificate_img;type:varchar(512);comment:中美协会证书url"` - JoinAssoTime string `json:"joinAssoTime" gorm:"column:join_asso_time;comment:入会时间"` - Photo string `gorm:"column:photo;type:varchar(255);comment:个人近照"` + MgmtAccId int64 `gorm:"column:mgmt_acc_id;not null;uniqueIndex:mgmt_acc_mgmt_artist_idx;comment:账号id"` + MgmtArtistId int64 `gorm:"column:mgmt_artist_id;not null;uniqueIndex:mgmt_acc_mgmt_artist_idx;comment:艺术家id"` + MgmtArtistUid string `gorm:"column:mgmt_artist_uid;type:varchar(256);comment:艺术家uid"` + TelNum string `gorm:"column:tel_num;type:varchar(20);not null;电话号码"` + InviteCode string `gorm:"column:invited_code;type:varchar(16);default:'';comment:个人邀请码"` + InvitedBy *Invite `gorm:"foreignKey:InvitedId"` //邀请者的相关信息 + Account string `gorm:"column:account;varchar(191);comment:账号"` + CertificateNum string `gorm:"column:certificate_num;type:varchar(16);comment:中美协会证书编号"` + CertificateImg string `gorm:"column:certificate_img;type:varchar(512);comment:中美协会证书url"` + JoinAssoTime string `json:"joinAssoTime" gorm:"column:join_asso_time;comment:入会时间"` + Photo string `gorm:"column:photo;type:varchar(255);comment:个人近照"` // 实名认证 IsRealName int64 `gorm:"column:is_real_name;default:0;是否实名认证:0未认证 1已认证"` diff --git a/cmd/model/user_invited.go b/cmd/model/user_invited.go index f635243..22a7c5f 100644 --- a/cmd/model/user_invited.go +++ b/cmd/model/user_invited.go @@ -3,7 +3,7 @@ package model // User 用户模型 type UserInvited struct { Model - // UserId int32 `gorm:"column:user_id;type:int;not null;comment:邀请人id"` + UserId int32 `gorm:"column:user_id;type:int;not null;comment:邀请人id"` InviteCode string `gorm:"column:invite_code;comment:邀请人的邀请码"` InvitedCode string `gorm:"column:invited_code;comment:受邀请人的邀请码"` InvitedUserId int32 `gorm:"column:invited_user_id;type:int;not null;comment:受邀请人画家宝用户id"`