From 943ccb7c5dcc0ca4c38c099b1ab9c96ea76c8da1 Mon Sep 17 00:00:00 2001 From: dorlolo <428192774@qq.com> Date: Tue, 14 Mar 2023 18:45:35 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E5=BC=80=E5=8F=91=E9=82=80=E8=AF=B7?= =?UTF-8?q?=E5=85=B3=E7=B3=BB=E7=BB=9F=E8=AE=A1=E6=8E=A5=E5=8F=A3=202.=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/internal/controller/artistInfo_user.go | 7 + cmd/internal/dao/artistInfo_user.go | 205 +++++-- cmd/internal/logic/artistInfo_user.go | 10 + cmd/model/user_invited.go | 4 + pb/artistInfoUser/artistinfoUser.pb.go | 500 +++++++++++++++--- pb/artistInfoUser/artistinfoUser_triple.pb.go | 90 ++++ pb/artistinfoUser.proto | 33 +- 7 files changed, 738 insertions(+), 111 deletions(-) diff --git a/cmd/internal/controller/artistInfo_user.go b/cmd/internal/controller/artistInfo_user.go index e226063..cb98d17 100644 --- a/cmd/internal/controller/artistInfo_user.go +++ b/cmd/internal/controller/artistInfo_user.go @@ -20,6 +20,13 @@ type ArtistInfoUserProvider struct { artistInfoLogic *logic.ArtistInfoUser } +func (a *ArtistInfoUserProvider) GetInviteStaticList(ctx context.Context, request *artistInfoUser.GetInviteStaticListRequest) (*artistInfoUser.GetInviteStaticListResponse, error) { + return a.artistInfoLogic.GetInviteStaticList(request) +} +func (a *ArtistInfoUserProvider) GetInviterUserList(ctx context.Context, request *artistInfoUser.GetInviterUserListRequest) (*artistInfoUser.GetInvitedUserListResponse, error) { + return a.artistInfoLogic.GetInviterUserList(request) +} + func (a *ArtistInfoUserProvider) GetInvitedUserList(ctx context.Context, request *artistInfoUser.GetInvitedUserListRequest) (*artistInfoUser.GetInvitedUserListResponse, error) { return a.artistInfoLogic.GetInvitedUserList(request) } diff --git a/cmd/internal/dao/artistInfo_user.go b/cmd/internal/dao/artistInfo_user.go index 28e1a05..df94b5b 100644 --- a/cmd/internal/dao/artistInfo_user.go +++ b/cmd/internal/dao/artistInfo_user.go @@ -881,6 +881,61 @@ func CheckUserLockByArtistUid(artistUid string) (err error) { } return nil } + +// GetInviterInfo 查询邀请人信息 +// invitedCode:受邀请人的邀请码 +func GetInviterInfo(inviterCode string) (result account.AccountInfo) { + //查找邀请关系 + var inviteRelation = model.Invite{} + err := db.DB.Model(model.Invite{}).Where("invite_code = ?", inviterCode).Find(&inviteRelation).Error + if err != nil { + fmt.Println("\n GetInviterInfo： 查询邀请人信息出错", err.Error()) + 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 +} + func GetInvitedUserList(in *artistInfoUser.GetInvitedUserListRequest) (res *artistInfoUser.GetInvitedUserListResponse, err error) { res = &artistInfoUser.GetInvitedUserListResponse{ Data: []*artistInfoUser.InvitedUser{}, @@ -950,56 +1005,116 @@ func GetInvitedUserList(in *artistInfoUser.GetInvitedUserListRequest) (res *arti return } -// GetInviterInfo 查询邀请人信息 -// invitedCode:受邀请人的邀请码 -func GetInviterInfo(invitedCode string) (result account.AccountInfo) { - //查找邀请关系 - var inviteRelation = model.Invite{} - err := db.DB.Model(model.Invite{}).Where("invited_code = ?", invitedCode).Find(&inviteRelation).Error - if err != nil { - fmt.Println("\n GetInviterInfo： 查询邀请人信息出错", err.Error()) - return +// 通过受邀请人的邀请码，查询他的邀请人列表 +func GetInviterUserList(in *artistInfoUser.GetInviterUserListRequest) (res *artistInfoUser.GetInvitedUserListResponse, err error) { + res = &artistInfoUser.GetInvitedUserListResponse{ + Data: []*artistInfoUser.InvitedUser{}, + Page: &artistInfoUser.UserCommonPageInfo{ + Page: int32(in.Page), + PageSize: int32(in.PageSize), + }, } - //查询邀请人信息 - res, err := service.AccountProvider.ListByIDs(context.Background(), &account.ListByIDsRequest{ - Page: 1, - PageSize: 1, - InvitationCode: []string{inviteRelation.InviteCode}, + var inviteCodes []int64 + db.DB.Model(model.Invite{}).Where("invited_code = ?", in.InvitedCode).Pluck("invite_code", &inviteCodes) + var invitedList []model.User + orm := db.DB.Model(model.User{}).Preload("RealNameInfo").Where("invited_code in ?", inviteCodes) //查询邀请人 + if err = orm.Count(&res.Page.Total).Scopes(db.Pagination(in.Page, in.PageSize)).Find(&invitedList).Error; err != nil { + return nil, err + } + //查询画家基本信息 + var artistProfileList = &artist.ArtistListResponse{Data: []*artist.ProfileRequest{}} + var artistUids = []string{} + for _, v := range invitedList { + if v.MgmtArtistUid != "" { + artistUids = append(artistUids, v.MgmtArtistUid) + } + } + artistProfileList, err = service.GrpcArtistImpl.ArtistList(context.Background(), &artist.ArtistListRequest{ + Page: 1, + PageSize: int32(len(artistUids)), + Uids: artistUids, + Gender: -1, }) if err != nil { - fmt.Println("\n GetInviterInfo 查询邀请人信息出错 service.AccountProvider.ListByIDs Error", err.Error()) - return + return nil, err } - 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, + for _, v := range invitedList { + var ( + realName string + sex string + age int64 + penName string + stageName string + ) + if v.RealNameInfo != nil { + realName = v.RealNameInfo.Name + sex = string(v.RealNameInfo.Sex) + age = int64(v.RealNameInfo.Age) + } + for _, artistProfile := range artistProfileList.Data { + if v.MgmtArtistUid == artistProfile.Uid { + penName = artistProfile.PenName + stageName = artistProfile.StageName + } + } + res.Data = append(res.Data, &artistInfoUser.InvitedUser{ + UserId: v.ID, + AccId: v.MgmtAccId, + ArtistUid: v.MgmtArtistUid, + TelNum: v.TelNum, + InviteCode: v.InviteCode, + Account: v.Account, + Photo: v.Photo, + IsRealName: v.IsRealName, + FddState: v.FddState, + RealName: realName, + Sex: sex, + Age: age, + CreatedAt: stime.TimeToString(v.CreatedAt, stime.Format_Normal_YMDhms), + PenName: penName, + StageName: stageName, + }) + } + return +} + +// 邀请关系数据统计 +type inviteStatic struct { + RealName string `gorm:"column:real_name"` + TelNum string `gorm:"column:tel_num"` + InviteCode string `gorm:"column:invite_code"` + InvitePicUrl string `gorm:"-"` + InvitedCount int64 `gorm:"column:invited_count"` +} + +func GetInviteStaticList(in *artistInfoUser.GetInviteStaticListRequest) (res *artistInfoUser.GetInviteStaticListResponse, err error) { + res = &artistInfoUser.GetInviteStaticListResponse{Data: []*artistInfoUser.GetInviteStaticListData{}, Page: &artistInfoUser.UserCommonPageInfo{ + Page: int32(in.Page), + PageSize: int32(in.PageSize), + }} + orm := db.DB. + Select("ui.invite_code,max(rn.name) real_name, max(su.tel_num) tel_num,max(su.mgmt_artist_uid) artist_uid,count(ui.invited_code) invited_count "). + Table(model.UserInvited{}.TableName() + " AS ui"). + Joins(fmt.Sprintf("LEFT JOIN %v su ON su.invited_code = ui.invite_code", model.User{}.TableName())). + Joins((fmt.Sprintf("LEFT JOIN %v rn ON rn.id = su.real_name_id", model.RealName{}.TableName()))). + Where("su.deleted_at=0"). + Group("ui.invite_code") + if in.KeyWords != "" { + orm = orm.Where("rn.name LIKE '%%?%%' OR su.tel_num LIKE '%%?%%' OR su.invited_code LIKE '%%?%%' ", in.KeyWords, in.KeyWords, in.KeyWords) + } + var datas []inviteStatic + err = orm.Count(&res.Page.Total).Scopes(db.Pagination(in.Page, in.PageSize)).Find(&datas).Error + if len(datas) > 0 { + for i, v := range datas { + res.Data = append(res.Data, &artistInfoUser.GetInviteStaticListData{ + Idx: int64(i + 1), + RealName: v.RealName, + TelNum: v.TelNum, + InviteCode: v.InviteCode, + InvitePicUrl: fmt.Sprintf("https://cdn.fontree.cn/artistmgmt/static/qrcode/%v.png", v.InviteCode), + InvitedCount: v.InvitedCount, + }) } - return } return } diff --git a/cmd/internal/logic/artistInfo_user.go b/cmd/internal/logic/artistInfo_user.go index 975f441..689414c 100644 --- a/cmd/internal/logic/artistInfo_user.go +++ b/cmd/internal/logic/artistInfo_user.go @@ -191,7 +191,17 @@ func (a *ArtistInfoUser) GetPreSaveArtistInfo(in *artistInfoUser.GetPreSaveArtis res, err = dao.GetPreSaveArtistInfo(in) return } + func (a *ArtistInfoUser) GetInvitedUserList(in *artistInfoUser.GetInvitedUserListRequest) (res *artistInfoUser.GetInvitedUserListResponse, err error) { res, err = dao.GetInvitedUserList(in) return } + +func (a *ArtistInfoUser) GetInviterUserList(in *artistInfoUser.GetInviterUserListRequest) (res *artistInfoUser.GetInvitedUserListResponse, err error) { + res, err = dao.GetInviterUserList(in) + return +} +func (a *ArtistInfoUser) GetInviteStaticList(in *artistInfoUser.GetInviteStaticListRequest) (res *artistInfoUser.GetInviteStaticListResponse, err error) { + res, err = dao.GetInviteStaticList(in) + return +} diff --git a/cmd/model/user_invited.go b/cmd/model/user_invited.go index cd85980..f635243 100644 --- a/cmd/model/user_invited.go +++ b/cmd/model/user_invited.go @@ -9,3 +9,7 @@ type UserInvited struct { InvitedUserId int32 `gorm:"column:invited_user_id;type:int;not null;comment:受邀请人画家宝用户id"` Count int32 `gorm:"column:count;type:int;default:1;邀请次数统计"` } + +func (UserInvited) TableName() string { + return "user_invited" +} diff --git a/pb/artistInfoUser/artistinfoUser.pb.go b/pb/artistInfoUser/artistinfoUser.pb.go index 6881cb4..46c26da 100644 --- a/pb/artistInfoUser/artistinfoUser.pb.go +++ b/pb/artistInfoUser/artistinfoUser.pb.go @@ -2953,9 +2953,9 @@ type BindInviteInvitedAccountRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - InvitedUserId int32 `protobuf:"varint,2,opt,name=invitedUserId,proto3" json:"invitedUserId,omitempty"` // 受邀请人的画家宝用户id - InviteCode string `protobuf:"bytes,3,opt,name=inviteCode,proto3" json:"inviteCode,omitempty"` // 邀请人的邀请码 - InvitedCode string `protobuf:"bytes,4,opt,name=invitedCode,proto3" json:"invitedCode,omitempty"` // 受邀请人的邀请码 + InvitedUserId int32 `protobuf:"varint,1,opt,name=invitedUserId,proto3" json:"invitedUserId,omitempty"` // 受邀请人的画家宝用户id + InviteCode string `protobuf:"bytes,2,opt,name=inviteCode,proto3" json:"inviteCode,omitempty"` // 邀请人的邀请码 + InvitedCode string `protobuf:"bytes,3,opt,name=invitedCode,proto3" json:"invitedCode,omitempty"` // 受邀请人的邀请码 } func (x *BindInviteInvitedAccountRequest) Reset() { @@ -4691,6 +4691,274 @@ func (x *GetInvitedUserListResponse) GetPage() *UserCommonPageInfo { return nil } +type GetInviterUserListRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + InvitedCode string `protobuf:"bytes,1,opt,name=invitedCode,proto3" json:"invitedCode,omitempty"` //受邀请者的邀请码 + Page int64 `protobuf:"varint,2,opt,name=page,proto3" json:"page,omitempty"` + PageSize int64 `protobuf:"varint,3,opt,name=pageSize,proto3" json:"pageSize,omitempty"` +} + +func (x *GetInviterUserListRequest) Reset() { + *x = GetInviterUserListRequest{} + if protoimpl.UnsafeEnabled { + mi := &file_pb_artistinfoUser_proto_msgTypes[53] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *GetInviterUserListRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*GetInviterUserListRequest) ProtoMessage() {} + +func (x *GetInviterUserListRequest) ProtoReflect() protoreflect.Message { + mi := &file_pb_artistinfoUser_proto_msgTypes[53] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use GetInviterUserListRequest.ProtoReflect.Descriptor instead. +func (*GetInviterUserListRequest) Descriptor() ([]byte, []int) { + return file_pb_artistinfoUser_proto_rawDescGZIP(), []int{53} +} + +func (x *GetInviterUserListRequest) GetInvitedCode() string { + if x != nil { + return x.InvitedCode + } + return "" +} + +func (x *GetInviterUserListRequest) GetPage() int64 { + if x != nil { + return x.Page + } + return 0 +} + +func (x *GetInviterUserListRequest) GetPageSize() int64 { + if x != nil { + return x.PageSize + } + return 0 +} + +type GetInviteStaticListRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Page int64 `protobuf:"varint,1,opt,name=page,proto3" json:"page,omitempty"` + PageSize int64 `protobuf:"varint,2,opt,name=pageSize,proto3" json:"pageSize,omitempty"` + KeyWords string `protobuf:"bytes,3,opt,name=KeyWords,proto3" json:"KeyWords,omitempty"` //关键字 受邀请者的邀请码 OR 受邀请者的姓名 OR 受邀请者的手机号码 +} + +func (x *GetInviteStaticListRequest) Reset() { + *x = GetInviteStaticListRequest{} + if protoimpl.UnsafeEnabled { + mi := &file_pb_artistinfoUser_proto_msgTypes[54] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *GetInviteStaticListRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*GetInviteStaticListRequest) ProtoMessage() {} + +func (x *GetInviteStaticListRequest) ProtoReflect() protoreflect.Message { + mi := &file_pb_artistinfoUser_proto_msgTypes[54] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use GetInviteStaticListRequest.ProtoReflect.Descriptor instead. +func (*GetInviteStaticListRequest) Descriptor() ([]byte, []int) { + return file_pb_artistinfoUser_proto_rawDescGZIP(), []int{54} +} + +func (x *GetInviteStaticListRequest) GetPage() int64 { + if x != nil { + return x.Page + } + return 0 +} + +func (x *GetInviteStaticListRequest) GetPageSize() int64 { + if x != nil { + return x.PageSize + } + return 0 +} + +func (x *GetInviteStaticListRequest) GetKeyWords() string { + if x != nil { + return x.KeyWords + } + return "" +} + +type GetInviteStaticListData struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Idx int64 `protobuf:"varint,1,opt,name=idx,proto3" json:"idx,omitempty"` //序号 + RealName string `protobuf:"bytes,2,opt,name=realName,proto3" json:"realName,omitempty"` //画家真实姓名 + TelNum string `protobuf:"bytes,3,opt,name=telNum,proto3" json:"telNum,omitempty"` //电话号码 + InviteCode string `protobuf:"bytes,4,opt,name=inviteCode,proto3" json:"inviteCode,omitempty"` //邀请码 + InvitePicUrl string `protobuf:"bytes,5,opt,name=invitePicUrl,proto3" json:"invitePicUrl,omitempty"` //邀请二维码 + InvitedCount int64 `protobuf:"varint,6,opt,name=invitedCount,proto3" json:"invitedCount,omitempty"` //邀请人员总数 +} + +func (x *GetInviteStaticListData) Reset() { + *x = GetInviteStaticListData{} + if protoimpl.UnsafeEnabled { + mi := &file_pb_artistinfoUser_proto_msgTypes[55] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *GetInviteStaticListData) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*GetInviteStaticListData) ProtoMessage() {} + +func (x *GetInviteStaticListData) ProtoReflect() protoreflect.Message { + mi := &file_pb_artistinfoUser_proto_msgTypes[55] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use GetInviteStaticListData.ProtoReflect.Descriptor instead. +func (*GetInviteStaticListData) Descriptor() ([]byte, []int) { + return file_pb_artistinfoUser_proto_rawDescGZIP(), []int{55} +} + +func (x *GetInviteStaticListData) GetIdx() int64 { + if x != nil { + return x.Idx + } + return 0 +} + +func (x *GetInviteStaticListData) GetRealName() string { + if x != nil { + return x.RealName + } + return "" +} + +func (x *GetInviteStaticListData) GetTelNum() string { + if x != nil { + return x.TelNum + } + return "" +} + +func (x *GetInviteStaticListData) GetInviteCode() string { + if x != nil { + return x.InviteCode + } + return "" +} + +func (x *GetInviteStaticListData) GetInvitePicUrl() string { + if x != nil { + return x.InvitePicUrl + } + return "" +} + +func (x *GetInviteStaticListData) GetInvitedCount() int64 { + if x != nil { + return x.InvitedCount + } + return 0 +} + +type GetInviteStaticListResponse struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Data []*GetInviteStaticListData `protobuf:"bytes,1,rep,name=data,proto3" json:"data,omitempty"` + Page *UserCommonPageInfo `protobuf:"bytes,2,opt,name=page,proto3" json:"page,omitempty"` +} + +func (x *GetInviteStaticListResponse) Reset() { + *x = GetInviteStaticListResponse{} + if protoimpl.UnsafeEnabled { + mi := &file_pb_artistinfoUser_proto_msgTypes[56] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *GetInviteStaticListResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*GetInviteStaticListResponse) ProtoMessage() {} + +func (x *GetInviteStaticListResponse) ProtoReflect() protoreflect.Message { + mi := &file_pb_artistinfoUser_proto_msgTypes[56] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use GetInviteStaticListResponse.ProtoReflect.Descriptor instead. +func (*GetInviteStaticListResponse) Descriptor() ([]byte, []int) { + return file_pb_artistinfoUser_proto_rawDescGZIP(), []int{56} +} + +func (x *GetInviteStaticListResponse) GetData() []*GetInviteStaticListData { + if x != nil { + return x.Data + } + return nil +} + +func (x *GetInviteStaticListResponse) GetPage() *UserCommonPageInfo { + if x != nil { + return x.Page + } + return nil +} + var File_pb_artistinfoUser_proto protoreflect.FileDescriptor var file_pb_artistinfoUser_proto_rawDesc = []byte{ @@ -5086,11 +5354,11 @@ var file_pb_artistinfoUser_proto_rawDesc = []byte{ 0x65, 0x22, 0x89, 0x01, 0x0a, 0x1f, 0x42, 0x69, 0x6e, 0x64, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x64, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x24, 0x0a, 0x0d, 0x69, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x64, - 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x69, 0x6e, + 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x69, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x64, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x69, - 0x6e, 0x76, 0x69, 0x74, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x6e, 0x76, 0x69, 0x74, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x69, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x69, - 0x6e, 0x76, 0x69, 0x74, 0x65, 0x64, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, + 0x6e, 0x76, 0x69, 0x74, 0x65, 0x64, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x69, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x64, 0x43, 0x6f, 0x64, 0x65, 0x22, 0x21, 0x0a, 0x1f, 0x42, 0x69, 0x6e, 0x64, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x64, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, @@ -5357,8 +5625,43 @@ var file_pb_artistinfoUser_proto_rawDesc = []byte{ 0x64, 0x55, 0x73, 0x65, 0x72, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x32, 0x0a, 0x04, 0x70, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, + 0x6e, 0x50, 0x61, 0x67, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x70, 0x61, 0x67, 0x65, 0x22, + 0x6d, 0x0a, 0x19, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x72, 0x55, 0x73, 0x65, + 0x72, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x20, 0x0a, 0x0b, + 0x69, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x64, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x0b, 0x69, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x64, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x12, + 0x0a, 0x04, 0x70, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x70, 0x61, + 0x67, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x61, 0x67, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x18, 0x03, + 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x70, 0x61, 0x67, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x22, 0x68, + 0x0a, 0x1a, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x53, 0x74, 0x61, 0x74, 0x69, + 0x63, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, + 0x70, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x70, 0x61, 0x67, 0x65, + 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x61, 0x67, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x03, 0x52, 0x08, 0x70, 0x61, 0x67, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x12, 0x1a, 0x0a, 0x08, + 0x4b, 0x65, 0x79, 0x57, 0x6f, 0x72, 0x64, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, + 0x4b, 0x65, 0x79, 0x57, 0x6f, 0x72, 0x64, 0x73, 0x22, 0xc7, 0x01, 0x0a, 0x17, 0x47, 0x65, 0x74, + 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x53, 0x74, 0x61, 0x74, 0x69, 0x63, 0x4c, 0x69, 0x73, 0x74, + 0x44, 0x61, 0x74, 0x61, 0x12, 0x10, 0x0a, 0x03, 0x69, 0x64, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x03, 0x52, 0x03, 0x69, 0x64, 0x78, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65, 0x61, 0x6c, 0x4e, 0x61, + 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x72, 0x65, 0x61, 0x6c, 0x4e, 0x61, + 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x65, 0x6c, 0x4e, 0x75, 0x6d, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x06, 0x74, 0x65, 0x6c, 0x4e, 0x75, 0x6d, 0x12, 0x1e, 0x0a, 0x0a, 0x69, 0x6e, + 0x76, 0x69, 0x74, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, + 0x69, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x69, 0x6e, + 0x76, 0x69, 0x74, 0x65, 0x50, 0x69, 0x63, 0x55, 0x72, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x0c, 0x69, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x50, 0x69, 0x63, 0x55, 0x72, 0x6c, 0x12, 0x22, + 0x0a, 0x0c, 0x69, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x64, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x06, + 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x69, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x64, 0x43, 0x6f, 0x75, + 0x6e, 0x74, 0x22, 0x8a, 0x01, 0x0a, 0x1b, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, + 0x53, 0x74, 0x61, 0x74, 0x69, 0x63, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, + 0x73, 0x65, 0x12, 0x37, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x23, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x47, 0x65, + 0x74, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x53, 0x74, 0x61, 0x74, 0x69, 0x63, 0x4c, 0x69, 0x73, + 0x74, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x32, 0x0a, 0x04, 0x70, + 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x61, 0x72, 0x74, 0x69, + 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x50, 0x61, 0x67, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x70, 0x61, 0x67, 0x65, 0x32, - 0xa3, 0x0f, 0x0a, 0x0e, 0x41, 0x72, 0x74, 0x69, 0x73, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x55, 0x73, + 0xf4, 0x10, 0x0a, 0x0e, 0x41, 0x72, 0x74, 0x69, 0x73, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x55, 0x73, 0x65, 0x72, 0x12, 0x52, 0x0a, 0x0c, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x55, 0x73, 0x65, 0x72, 0x12, 0x1f, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, @@ -5480,9 +5783,22 @@ var file_pb_artistinfoUser_proto_rawDesc = []byte{ 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x26, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x64, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, - 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x13, 0x5a, 0x11, 0x2e, 0x2f, 0x3b, 0x61, 0x72, 0x74, 0x69, - 0x73, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x55, 0x73, 0x65, 0x72, 0x50, 0x00, 0x62, 0x06, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x33, + 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x65, 0x0a, 0x12, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x76, 0x69, + 0x74, 0x65, 0x72, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x25, 0x2e, 0x61, 0x72, + 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x76, 0x69, + 0x74, 0x65, 0x72, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, + 0x73, 0x74, 0x1a, 0x26, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, + 0x47, 0x65, 0x74, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x64, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x69, + 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x68, 0x0a, 0x13, + 0x47, 0x65, 0x74, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x53, 0x74, 0x61, 0x74, 0x69, 0x63, 0x4c, + 0x69, 0x73, 0x74, 0x12, 0x26, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, + 0x2e, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x53, 0x74, 0x61, 0x74, 0x69, 0x63, + 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x61, 0x72, + 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x76, 0x69, + 0x74, 0x65, 0x53, 0x74, 0x61, 0x74, 0x69, 0x63, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, + 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x13, 0x5a, 0x11, 0x2e, 0x2f, 0x3b, 0x61, 0x72, 0x74, + 0x69, 0x73, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x55, 0x73, 0x65, 0x72, 0x50, 0x00, 0x62, 0x06, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -5497,7 +5813,7 @@ func file_pb_artistinfoUser_proto_rawDescGZIP() []byte { return file_pb_artistinfoUser_proto_rawDescData } -var file_pb_artistinfoUser_proto_msgTypes = make([]protoimpl.MessageInfo, 53) +var file_pb_artistinfoUser_proto_msgTypes = make([]protoimpl.MessageInfo, 57) var file_pb_artistinfoUser_proto_goTypes = []interface{}{ (*CommonNoParams)(nil), // 0: artistinfo.CommonNoParams (*UserCommonPageInfo)(nil), // 1: artistinfo.UserCommonPageInfo @@ -5552,6 +5868,10 @@ var file_pb_artistinfoUser_proto_goTypes = []interface{}{ (*GetInvitedUserListRequest)(nil), // 50: artistinfo.GetInvitedUserListRequest (*InvitedUser)(nil), // 51: artistinfo.InvitedUser (*GetInvitedUserListResponse)(nil), // 52: artistinfo.GetInvitedUserListResponse + (*GetInviterUserListRequest)(nil), // 53: artistinfo.GetInviterUserListRequest + (*GetInviteStaticListRequest)(nil), // 54: artistinfo.GetInviteStaticListRequest + (*GetInviteStaticListData)(nil), // 55: artistinfo.GetInviteStaticListData + (*GetInviteStaticListResponse)(nil), // 56: artistinfo.GetInviteStaticListResponse } var file_pb_artistinfoUser_proto_depIdxs = []int32{ 33, // 0: artistinfo.ArtistSupplyListRespond.data:type_name -> artistinfo.ArtistArtworkSupplyListResponseData @@ -5562,57 +5882,63 @@ var file_pb_artistinfoUser_proto_depIdxs = []int32{ 1, // 5: artistinfo.FindUsersUserViewResponse.page:type_name -> artistinfo.UserCommonPageInfo 51, // 6: artistinfo.GetInvitedUserListResponse.data:type_name -> artistinfo.InvitedUser 1, // 7: artistinfo.GetInvitedUserListResponse.page:type_name -> artistinfo.UserCommonPageInfo - 14, // 8: artistinfo.ArtistInfoUser.RegisterUser:input_type -> artistinfo.RegisterUserRequest - 12, // 9: artistinfo.ArtistInfoUser.UpdateIdCard:input_type -> artistinfo.UpdateIdCardRequest - 16, // 10: artistinfo.ArtistInfoUser.GetUser:input_type -> artistinfo.GetUserRequest - 18, // 11: artistinfo.ArtistInfoUser.GetUserById:input_type -> artistinfo.GetUserByIdRequest - 21, // 12: artistinfo.ArtistInfoUser.CreateUser:input_type -> artistinfo.CreateUserRequest - 23, // 13: artistinfo.ArtistInfoUser.CreateUserInfo:input_type -> artistinfo.CreateUserInfoRequest - 27, // 14: artistinfo.ArtistInfoUser.FinishVerify:input_type -> artistinfo.FinishVerifyRequest - 29, // 15: artistinfo.ArtistInfoUser.CheckUserLock:input_type -> artistinfo.CheckUserLockRequest - 31, // 16: artistinfo.ArtistInfoUser.ArtistSupplyList:input_type -> artistinfo.ArtistSupplyListRequest - 34, // 17: artistinfo.ArtistInfoUser.UserLock:input_type -> artistinfo.UserLockRequest - 6, // 18: artistinfo.ArtistInfoUser.CheckInvitedCode:input_type -> artistinfo.CheckInvitedCodeRequest - 8, // 19: artistinfo.ArtistInfoUser.UnFinishList:input_type -> artistinfo.UnFinishListRequest - 4, // 20: artistinfo.ArtistInfoUser.GetUserMsg:input_type -> artistinfo.GetUserMsgRequest - 2, // 21: artistinfo.ArtistInfoUser.UpdateMsg:input_type -> artistinfo.UpdateMsgRequest - 36, // 22: artistinfo.ArtistInfoUser.BindInviteInvitedAccount:input_type -> artistinfo.BindInviteInvitedAccountRequest - 38, // 23: artistinfo.ArtistInfoUser.BindArtistId:input_type -> artistinfo.BindArtistIdRequest - 41, // 24: artistinfo.ArtistInfoUser.FindUser:input_type -> artistinfo.FindUserRequest - 42, // 25: artistinfo.ArtistInfoUser.FindUsers:input_type -> artistinfo.FindUsersRequest - 42, // 26: artistinfo.ArtistInfoUser.FindUsersUserView:input_type -> artistinfo.FindUsersRequest - 45, // 27: artistinfo.ArtistInfoUser.UpdateUserData:input_type -> artistinfo.UserInfo - 46, // 28: artistinfo.ArtistInfoUser.PreSaveArtistInfo:input_type -> artistinfo.PreSaveArtistInfoData - 47, // 29: artistinfo.ArtistInfoUser.GetPreSaveArtistInfo:input_type -> artistinfo.GetPreSaveArtistInfoRequest - 50, // 30: artistinfo.ArtistInfoUser.GetInvitedUserList:input_type -> artistinfo.GetInvitedUserListRequest - 15, // 31: artistinfo.ArtistInfoUser.RegisterUser:output_type -> artistinfo.RegisterUserRespond - 0, // 32: artistinfo.ArtistInfoUser.UpdateIdCard:output_type -> artistinfo.CommonNoParams - 17, // 33: artistinfo.ArtistInfoUser.GetUser:output_type -> artistinfo.GetUserRespond - 19, // 34: artistinfo.ArtistInfoUser.GetUserById:output_type -> artistinfo.GetUserByIdRespond - 22, // 35: artistinfo.ArtistInfoUser.CreateUser:output_type -> artistinfo.CreateUserRespond - 24, // 36: artistinfo.ArtistInfoUser.CreateUserInfo:output_type -> artistinfo.CreateUserInfoRespond - 28, // 37: artistinfo.ArtistInfoUser.FinishVerify:output_type -> artistinfo.FinishVerifyRespond - 30, // 38: artistinfo.ArtistInfoUser.CheckUserLock:output_type -> artistinfo.CheckUserLockRespond - 32, // 39: artistinfo.ArtistInfoUser.ArtistSupplyList:output_type -> artistinfo.ArtistSupplyListRespond - 35, // 40: artistinfo.ArtistInfoUser.UserLock:output_type -> artistinfo.UserLockRespond - 17, // 41: artistinfo.ArtistInfoUser.CheckInvitedCode:output_type -> artistinfo.GetUserRespond - 9, // 42: artistinfo.ArtistInfoUser.UnFinishList:output_type -> artistinfo.UnFinishListRespond - 5, // 43: artistinfo.ArtistInfoUser.GetUserMsg:output_type -> artistinfo.GetUserMsgRespond - 3, // 44: artistinfo.ArtistInfoUser.UpdateMsg:output_type -> artistinfo.UpdateMsgRespond - 37, // 45: artistinfo.ArtistInfoUser.BindInviteInvitedAccount:output_type -> artistinfo.BindInviteInvitedAccountRespond - 39, // 46: artistinfo.ArtistInfoUser.BindArtistId:output_type -> artistinfo.BindArtistIdResp - 45, // 47: artistinfo.ArtistInfoUser.FindUser:output_type -> artistinfo.UserInfo - 43, // 48: artistinfo.ArtistInfoUser.FindUsers:output_type -> artistinfo.FindUsersResponse - 49, // 49: artistinfo.ArtistInfoUser.FindUsersUserView:output_type -> artistinfo.FindUsersUserViewResponse - 0, // 50: artistinfo.ArtistInfoUser.UpdateUserData:output_type -> artistinfo.CommonNoParams - 0, // 51: artistinfo.ArtistInfoUser.PreSaveArtistInfo:output_type -> artistinfo.CommonNoParams - 46, // 52: artistinfo.ArtistInfoUser.GetPreSaveArtistInfo:output_type -> artistinfo.PreSaveArtistInfoData - 52, // 53: artistinfo.ArtistInfoUser.GetInvitedUserList:output_type -> artistinfo.GetInvitedUserListResponse - 31, // [31:54] is the sub-list for method output_type - 8, // [8:31] is the sub-list for method input_type - 8, // [8:8] is the sub-list for extension type_name - 8, // [8:8] is the sub-list for extension extendee - 0, // [0:8] is the sub-list for field type_name + 55, // 8: artistinfo.GetInviteStaticListResponse.data:type_name -> artistinfo.GetInviteStaticListData + 1, // 9: artistinfo.GetInviteStaticListResponse.page:type_name -> artistinfo.UserCommonPageInfo + 14, // 10: artistinfo.ArtistInfoUser.RegisterUser:input_type -> artistinfo.RegisterUserRequest + 12, // 11: artistinfo.ArtistInfoUser.UpdateIdCard:input_type -> artistinfo.UpdateIdCardRequest + 16, // 12: artistinfo.ArtistInfoUser.GetUser:input_type -> artistinfo.GetUserRequest + 18, // 13: artistinfo.ArtistInfoUser.GetUserById:input_type -> artistinfo.GetUserByIdRequest + 21, // 14: artistinfo.ArtistInfoUser.CreateUser:input_type -> artistinfo.CreateUserRequest + 23, // 15: artistinfo.ArtistInfoUser.CreateUserInfo:input_type -> artistinfo.CreateUserInfoRequest + 27, // 16: artistinfo.ArtistInfoUser.FinishVerify:input_type -> artistinfo.FinishVerifyRequest + 29, // 17: artistinfo.ArtistInfoUser.CheckUserLock:input_type -> artistinfo.CheckUserLockRequest + 31, // 18: artistinfo.ArtistInfoUser.ArtistSupplyList:input_type -> artistinfo.ArtistSupplyListRequest + 34, // 19: artistinfo.ArtistInfoUser.UserLock:input_type -> artistinfo.UserLockRequest + 6, // 20: artistinfo.ArtistInfoUser.CheckInvitedCode:input_type -> artistinfo.CheckInvitedCodeRequest + 8, // 21: artistinfo.ArtistInfoUser.UnFinishList:input_type -> artistinfo.UnFinishListRequest + 4, // 22: artistinfo.ArtistInfoUser.GetUserMsg:input_type -> artistinfo.GetUserMsgRequest + 2, // 23: artistinfo.ArtistInfoUser.UpdateMsg:input_type -> artistinfo.UpdateMsgRequest + 36, // 24: artistinfo.ArtistInfoUser.BindInviteInvitedAccount:input_type -> artistinfo.BindInviteInvitedAccountRequest + 38, // 25: artistinfo.ArtistInfoUser.BindArtistId:input_type -> artistinfo.BindArtistIdRequest + 41, // 26: artistinfo.ArtistInfoUser.FindUser:input_type -> artistinfo.FindUserRequest + 42, // 27: artistinfo.ArtistInfoUser.FindUsers:input_type -> artistinfo.FindUsersRequest + 42, // 28: artistinfo.ArtistInfoUser.FindUsersUserView:input_type -> artistinfo.FindUsersRequest + 45, // 29: artistinfo.ArtistInfoUser.UpdateUserData:input_type -> artistinfo.UserInfo + 46, // 30: artistinfo.ArtistInfoUser.PreSaveArtistInfo:input_type -> artistinfo.PreSaveArtistInfoData + 47, // 31: artistinfo.ArtistInfoUser.GetPreSaveArtistInfo:input_type -> artistinfo.GetPreSaveArtistInfoRequest + 50, // 32: artistinfo.ArtistInfoUser.GetInvitedUserList:input_type -> artistinfo.GetInvitedUserListRequest + 53, // 33: artistinfo.ArtistInfoUser.GetInviterUserList:input_type -> artistinfo.GetInviterUserListRequest + 54, // 34: artistinfo.ArtistInfoUser.GetInviteStaticList:input_type -> artistinfo.GetInviteStaticListRequest + 15, // 35: artistinfo.ArtistInfoUser.RegisterUser:output_type -> artistinfo.RegisterUserRespond + 0, // 36: artistinfo.ArtistInfoUser.UpdateIdCard:output_type -> artistinfo.CommonNoParams + 17, // 37: artistinfo.ArtistInfoUser.GetUser:output_type -> artistinfo.GetUserRespond + 19, // 38: artistinfo.ArtistInfoUser.GetUserById:output_type -> artistinfo.GetUserByIdRespond + 22, // 39: artistinfo.ArtistInfoUser.CreateUser:output_type -> artistinfo.CreateUserRespond + 24, // 40: artistinfo.ArtistInfoUser.CreateUserInfo:output_type -> artistinfo.CreateUserInfoRespond + 28, // 41: artistinfo.ArtistInfoUser.FinishVerify:output_type -> artistinfo.FinishVerifyRespond + 30, // 42: artistinfo.ArtistInfoUser.CheckUserLock:output_type -> artistinfo.CheckUserLockRespond + 32, // 43: artistinfo.ArtistInfoUser.ArtistSupplyList:output_type -> artistinfo.ArtistSupplyListRespond + 35, // 44: artistinfo.ArtistInfoUser.UserLock:output_type -> artistinfo.UserLockRespond + 17, // 45: artistinfo.ArtistInfoUser.CheckInvitedCode:output_type -> artistinfo.GetUserRespond + 9, // 46: artistinfo.ArtistInfoUser.UnFinishList:output_type -> artistinfo.UnFinishListRespond + 5, // 47: artistinfo.ArtistInfoUser.GetUserMsg:output_type -> artistinfo.GetUserMsgRespond + 3, // 48: artistinfo.ArtistInfoUser.UpdateMsg:output_type -> artistinfo.UpdateMsgRespond + 37, // 49: artistinfo.ArtistInfoUser.BindInviteInvitedAccount:output_type -> artistinfo.BindInviteInvitedAccountRespond + 39, // 50: artistinfo.ArtistInfoUser.BindArtistId:output_type -> artistinfo.BindArtistIdResp + 45, // 51: artistinfo.ArtistInfoUser.FindUser:output_type -> artistinfo.UserInfo + 43, // 52: artistinfo.ArtistInfoUser.FindUsers:output_type -> artistinfo.FindUsersResponse + 49, // 53: artistinfo.ArtistInfoUser.FindUsersUserView:output_type -> artistinfo.FindUsersUserViewResponse + 0, // 54: artistinfo.ArtistInfoUser.UpdateUserData:output_type -> artistinfo.CommonNoParams + 0, // 55: artistinfo.ArtistInfoUser.PreSaveArtistInfo:output_type -> artistinfo.CommonNoParams + 46, // 56: artistinfo.ArtistInfoUser.GetPreSaveArtistInfo:output_type -> artistinfo.PreSaveArtistInfoData + 52, // 57: artistinfo.ArtistInfoUser.GetInvitedUserList:output_type -> artistinfo.GetInvitedUserListResponse + 52, // 58: artistinfo.ArtistInfoUser.GetInviterUserList:output_type -> artistinfo.GetInvitedUserListResponse + 56, // 59: artistinfo.ArtistInfoUser.GetInviteStaticList:output_type -> artistinfo.GetInviteStaticListResponse + 35, // [35:60] is the sub-list for method output_type + 10, // [10:35] is the sub-list for method input_type + 10, // [10:10] is the sub-list for extension type_name + 10, // [10:10] is the sub-list for extension extendee + 0, // [0:10] is the sub-list for field type_name } func init() { file_pb_artistinfoUser_proto_init() } @@ -6257,6 +6583,54 @@ func file_pb_artistinfoUser_proto_init() { return nil } } + file_pb_artistinfoUser_proto_msgTypes[53].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*GetInviterUserListRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_pb_artistinfoUser_proto_msgTypes[54].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*GetInviteStaticListRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_pb_artistinfoUser_proto_msgTypes[55].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*GetInviteStaticListData); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_pb_artistinfoUser_proto_msgTypes[56].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*GetInviteStaticListResponse); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } type x struct{} out := protoimpl.TypeBuilder{ @@ -6264,7 +6638,7 @@ func file_pb_artistinfoUser_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_pb_artistinfoUser_proto_rawDesc, NumEnums: 0, - NumMessages: 53, + NumMessages: 57, NumExtensions: 0, NumServices: 1, }, diff --git a/pb/artistInfoUser/artistinfoUser_triple.pb.go b/pb/artistInfoUser/artistinfoUser_triple.pb.go index f9c7229..3db36b8 100644 --- a/pb/artistInfoUser/artistinfoUser_triple.pb.go +++ b/pb/artistInfoUser/artistinfoUser_triple.pb.go @@ -53,6 +53,8 @@ type ArtistInfoUserClient interface { PreSaveArtistInfo(ctx context.Context, in *PreSaveArtistInfoData, opts ...grpc_go.CallOption) (*CommonNoParams, common.ErrorWithAttachment) GetPreSaveArtistInfo(ctx context.Context, in *GetPreSaveArtistInfoRequest, opts ...grpc_go.CallOption) (*PreSaveArtistInfoData, common.ErrorWithAttachment) GetInvitedUserList(ctx context.Context, in *GetInvitedUserListRequest, opts ...grpc_go.CallOption) (*GetInvitedUserListResponse, common.ErrorWithAttachment) + GetInviterUserList(ctx context.Context, in *GetInviterUserListRequest, opts ...grpc_go.CallOption) (*GetInvitedUserListResponse, common.ErrorWithAttachment) + GetInviteStaticList(ctx context.Context, in *GetInviteStaticListRequest, opts ...grpc_go.CallOption) (*GetInviteStaticListResponse, common.ErrorWithAttachment) } type artistInfoUserClient struct { @@ -83,6 +85,8 @@ type ArtistInfoUserClientImpl struct { PreSaveArtistInfo func(ctx context.Context, in *PreSaveArtistInfoData) (*CommonNoParams, error) GetPreSaveArtistInfo func(ctx context.Context, in *GetPreSaveArtistInfoRequest) (*PreSaveArtistInfoData, error) GetInvitedUserList func(ctx context.Context, in *GetInvitedUserListRequest) (*GetInvitedUserListResponse, error) + GetInviterUserList func(ctx context.Context, in *GetInviterUserListRequest) (*GetInvitedUserListResponse, error) + GetInviteStaticList func(ctx context.Context, in *GetInviteStaticListRequest) (*GetInviteStaticListResponse, error) } func (c *ArtistInfoUserClientImpl) GetDubboStub(cc *triple.TripleConn) ArtistInfoUserClient { @@ -235,6 +239,18 @@ func (c *artistInfoUserClient) GetInvitedUserList(ctx context.Context, in *GetIn return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/GetInvitedUserList", in, out) } +func (c *artistInfoUserClient) GetInviterUserList(ctx context.Context, in *GetInviterUserListRequest, opts ...grpc_go.CallOption) (*GetInvitedUserListResponse, common.ErrorWithAttachment) { + out := new(GetInvitedUserListResponse) + interfaceKey := ctx.Value(constant.InterfaceKey).(string) + return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/GetInviterUserList", in, out) +} + +func (c *artistInfoUserClient) GetInviteStaticList(ctx context.Context, in *GetInviteStaticListRequest, opts ...grpc_go.CallOption) (*GetInviteStaticListResponse, common.ErrorWithAttachment) { + out := new(GetInviteStaticListResponse) + interfaceKey := ctx.Value(constant.InterfaceKey).(string) + return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/GetInviteStaticList", in, out) +} + // ArtistInfoUserServer is the server API for ArtistInfoUser service. // All implementations must embed UnimplementedArtistInfoUserServer // for forward compatibility @@ -264,6 +280,8 @@ type ArtistInfoUserServer interface { PreSaveArtistInfo(context.Context, *PreSaveArtistInfoData) (*CommonNoParams, error) GetPreSaveArtistInfo(context.Context, *GetPreSaveArtistInfoRequest) (*PreSaveArtistInfoData, error) GetInvitedUserList(context.Context, *GetInvitedUserListRequest) (*GetInvitedUserListResponse, error) + GetInviterUserList(context.Context, *GetInviterUserListRequest) (*GetInvitedUserListResponse, error) + GetInviteStaticList(context.Context, *GetInviteStaticListRequest) (*GetInviteStaticListResponse, error) mustEmbedUnimplementedArtistInfoUserServer() } @@ -341,6 +359,12 @@ func (UnimplementedArtistInfoUserServer) GetPreSaveArtistInfo(context.Context, * func (UnimplementedArtistInfoUserServer) GetInvitedUserList(context.Context, *GetInvitedUserListRequest) (*GetInvitedUserListResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method GetInvitedUserList not implemented") } +func (UnimplementedArtistInfoUserServer) GetInviterUserList(context.Context, *GetInviterUserListRequest) (*GetInvitedUserListResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method GetInviterUserList not implemented") +} +func (UnimplementedArtistInfoUserServer) GetInviteStaticList(context.Context, *GetInviteStaticListRequest) (*GetInviteStaticListResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method GetInviteStaticList not implemented") +} func (s *UnimplementedArtistInfoUserServer) XXX_SetProxyImpl(impl protocol.Invoker) { s.proxyImpl = impl } @@ -1036,6 +1060,64 @@ func _ArtistInfoUser_GetInvitedUserList_Handler(srv interface{}, ctx context.Con return interceptor(ctx, in, info, handler) } +func _ArtistInfoUser_GetInviterUserList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) { + in := new(GetInviterUserListRequest) + if err := dec(in); err != nil { + return nil, err + } + base := srv.(dubbo3.Dubbo3GrpcService) + args := []interface{}{} + args = append(args, in) + md, _ := metadata.FromIncomingContext(ctx) + invAttachment := make(map[string]interface{}, len(md)) + for k, v := range md { + invAttachment[k] = v + } + invo := invocation.NewRPCInvocation("GetInviterUserList", args, invAttachment) + if interceptor == nil { + result := base.XXX_GetProxyImpl().Invoke(ctx, invo) + return result, result.Error() + } + info := &grpc_go.UnaryServerInfo{ + Server: srv, + FullMethod: ctx.Value("XXX_TRIPLE_GO_INTERFACE_NAME").(string), + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + result := base.XXX_GetProxyImpl().Invoke(ctx, invo) + return result, result.Error() + } + return interceptor(ctx, in, info, handler) +} + +func _ArtistInfoUser_GetInviteStaticList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) { + in := new(GetInviteStaticListRequest) + if err := dec(in); err != nil { + return nil, err + } + base := srv.(dubbo3.Dubbo3GrpcService) + args := []interface{}{} + args = append(args, in) + md, _ := metadata.FromIncomingContext(ctx) + invAttachment := make(map[string]interface{}, len(md)) + for k, v := range md { + invAttachment[k] = v + } + invo := invocation.NewRPCInvocation("GetInviteStaticList", args, invAttachment) + if interceptor == nil { + result := base.XXX_GetProxyImpl().Invoke(ctx, invo) + return result, result.Error() + } + info := &grpc_go.UnaryServerInfo{ + Server: srv, + FullMethod: ctx.Value("XXX_TRIPLE_GO_INTERFACE_NAME").(string), + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + result := base.XXX_GetProxyImpl().Invoke(ctx, invo) + return result, result.Error() + } + return interceptor(ctx, in, info, handler) +} + // ArtistInfoUser_ServiceDesc is the grpc_go.ServiceDesc for ArtistInfoUser service. // It's only intended for direct use with grpc_go.RegisterService, // and not to be introspected or modified (even as a copy) @@ -1135,6 +1217,14 @@ var ArtistInfoUser_ServiceDesc = grpc_go.ServiceDesc{ MethodName: "GetInvitedUserList", Handler: _ArtistInfoUser_GetInvitedUserList_Handler, }, + { + MethodName: "GetInviterUserList", + Handler: _ArtistInfoUser_GetInviterUserList_Handler, + }, + { + MethodName: "GetInviteStaticList", + Handler: _ArtistInfoUser_GetInviteStaticList_Handler, + }, }, Streams: []grpc_go.StreamDesc{}, Metadata: "pb/artistinfoUser.proto", diff --git a/pb/artistinfoUser.proto b/pb/artistinfoUser.proto index beec220..ec69bd1 100644 --- a/pb/artistinfoUser.proto +++ b/pb/artistinfoUser.proto @@ -22,13 +22,15 @@ service ArtistInfoUser { rpc UpdateMsg(UpdateMsgRequest) returns (UpdateMsgRespond){} //更新用户信息 rpc BindInviteInvitedAccount(BindInviteInvitedAccountRequest)returns(BindInviteInvitedAccountRespond){} //绑定邀请人与被邀请人账号 rpc BindArtistId(BindArtistIdRequest)returns(BindArtistIdResp){} // 账号绑定艺术家id - rpc FindUser(FindUserRequest)returns(UserInfo){}//查找单个用户信息 + rpc FindUser(FindUserRequest)returns(UserInfo){} //查找单个用户信息 rpc FindUsers(FindUsersRequest)returns(FindUsersResponse){} //批量查询用户信息 rpc FindUsersUserView(FindUsersRequest)returns(FindUsersUserViewResponse){} //使用视图批量查询用户信息 rpc UpdateUserData(UserInfo)returns(CommonNoParams){} //更新用户信息 rpc PreSaveArtistInfo(PreSaveArtistInfoData)returns(CommonNoParams){}//暂存艺术家信息 - rpc GetPreSaveArtistInfo(GetPreSaveArtistInfoRequest)returns(PreSaveArtistInfoData){}//获取暂存的艺术家信息 - rpc GetInvitedUserList(GetInvitedUserListRequest)returns(GetInvitedUserListResponse){}//获取接受邀请的人员列表 + rpc GetPreSaveArtistInfo(GetPreSaveArtistInfoRequest)returns(PreSaveArtistInfoData){} //获取暂存的艺术家信息 + rpc GetInvitedUserList(GetInvitedUserListRequest)returns(GetInvitedUserListResponse){} //通过邀请者的邀请码，获取接受邀请的人员列表 + rpc GetInviterUserList(GetInviterUserListRequest)returns(GetInvitedUserListResponse){} //通过接受邀请者的邀请码，获取邀请者列表 + rpc GetInviteStaticList(GetInviteStaticListRequest)returns(GetInviteStaticListResponse){}//获取邀请关系统计列表 } message CommonNoParams{ } @@ -520,6 +522,7 @@ message GetInvitedUserListRequest{ int64 page=3; int64 pageSize=4; } + message InvitedUser{ int64 userId=1; int64 accId=2; @@ -540,4 +543,28 @@ message InvitedUser{ message GetInvitedUserListResponse{ repeated InvitedUser data =1; UserCommonPageInfo page =2; +} + +message GetInviterUserListRequest{ + string invitedCode=1; //受邀请者的邀请码 + int64 page=2; + int64 pageSize=3; +} + +message GetInviteStaticListRequest{ + int64 page=1; + int64 pageSize=2; + string KeyWords=3; //关键字 受邀请者的邀请码 OR 受邀请者的姓名 OR 受邀请者的手机号码 +} +message GetInviteStaticListData{ + int64 idx=1;//序号 + string realName=2;//画家真实姓名 + string telNum=3;//电话号码 + string inviteCode=4;//邀请码 + string invitePicUrl=5;//邀请二维码 + int64 invitedCount=6;//邀请人员总数 +} +message GetInviteStaticListResponse{ + repeated GetInviteStaticListData data =1; + UserCommonPageInfo page=2; } \ No newline at end of file