From 8822343f44ff9442a3cfcf6bb70a8ecb7decc2ba Mon Sep 17 00:00:00 2001 From: Leufolium Date: Wed, 3 Jul 2024 16:43:58 +0800 Subject: [PATCH] by Robin at 20240703 --- api/proto/streamerauthapprovalbasic/proto/not_null_def_api.go | 2 -- api/proto/streamerauthapprovalbasic/proto/not_null_def_op.go | 2 -- .../streamerauthapprovaldetails/proto/not_null_def_api.go | 2 ++ .../streamerauthapprovaldetails/proto/not_null_def_op.go | 2 ++ app/mix/service/service.go | 4 ++-- dbstruct/streamerauthapproval.go | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/api/proto/streamerauthapprovalbasic/proto/not_null_def_api.go b/api/proto/streamerauthapprovalbasic/proto/not_null_def_api.go index fa6be2ff..a4ab3f52 100644 --- a/api/proto/streamerauthapprovalbasic/proto/not_null_def_api.go +++ b/api/proto/streamerauthapprovalbasic/proto/not_null_def_api.go @@ -9,10 +9,8 @@ func (p *ApiCreateReq) ProvideNotNullValue() (params []*validator.JsonParam) { params = make([]*validator.JsonParam, 0) params = append(params, validator.NewInt64PtrParam("请确认用户的Mid", p.StreamerAuthApprovalBasic.Mid)) params = append(params, validator.NewStructPtrParam("请设置您的头像", p.Avatar)) - params = append(params, validator.NewInt64PtrParam("请设置您的性别", p.Gender)) params = append(params, validator.NewStringPtrParam("请输入您的联系方式", p.ContactWay)) params = append(params, validator.NewStructPtrParam("请提供您的账号截图", p.AccountShot)) - params = append(params, validator.NewInt64PtrParam("请提供您的全网粉丝量", p.Fans)) params = append(params, validator.NewStringPtrParam("请提供您的主营平台", p.MainPlatform)) return } diff --git a/api/proto/streamerauthapprovalbasic/proto/not_null_def_op.go b/api/proto/streamerauthapprovalbasic/proto/not_null_def_op.go index a6130045..72e53f4e 100644 --- a/api/proto/streamerauthapprovalbasic/proto/not_null_def_op.go +++ b/api/proto/streamerauthapprovalbasic/proto/not_null_def_op.go @@ -9,10 +9,8 @@ func (p *OpCreateReq) ProvideNotNullValue() (params []*validator.JsonParam) { params = make([]*validator.JsonParam, 0) params = append(params, validator.NewInt64PtrParam("请确认用户的Mid", p.StreamerAuthApprovalBasic.Mid)) params = append(params, validator.NewStructPtrParam("请设置您的头像", p.Avatar)) - params = append(params, validator.NewInt64PtrParam("请设置您的性别", p.Gender)) params = append(params, validator.NewStringPtrParam("请输入您的联系方式", p.ContactWay)) params = append(params, validator.NewStructPtrParam("请提供您的账号截图", p.AccountShot)) - params = append(params, validator.NewInt64PtrParam("请提供您的全网粉丝量", p.Fans)) params = append(params, validator.NewStringPtrParam("请提供您的主营平台", p.MainPlatform)) return } diff --git a/api/proto/streamerauthapprovaldetails/proto/not_null_def_api.go b/api/proto/streamerauthapprovaldetails/proto/not_null_def_api.go index e27b020f..fe206090 100644 --- a/api/proto/streamerauthapprovaldetails/proto/not_null_def_api.go +++ b/api/proto/streamerauthapprovaldetails/proto/not_null_def_api.go @@ -8,6 +8,8 @@ import ( func (p *ApiCreateReq) ProvideNotNullValue() (params []*validator.JsonParam) { params = make([]*validator.JsonParam, 0) + params = append(params, validator.NewInt64PtrParam("请设置您的性别", p.Gender)) + params = append(params, validator.NewInt64PtrParam("请提供您的全网粉丝量", p.Fans)) params = append(params, validator.NewStringPtrParam("请输入您的个性签名", p.Bio)) params = append(params, validator.NewStructPtrParam("请设置您的封面", p.Cover)) params = append(params, validator.NewStructPtrParam("请设置您的展示视频", p.Shorts)) diff --git a/api/proto/streamerauthapprovaldetails/proto/not_null_def_op.go b/api/proto/streamerauthapprovaldetails/proto/not_null_def_op.go index 9531214b..7093b74f 100644 --- a/api/proto/streamerauthapprovaldetails/proto/not_null_def_op.go +++ b/api/proto/streamerauthapprovaldetails/proto/not_null_def_op.go @@ -8,6 +8,8 @@ import ( func (p *OpCreateReq) ProvideNotNullValue() (params []*validator.JsonParam) { params = make([]*validator.JsonParam, 0) + params = append(params, validator.NewInt64PtrParam("请设置您的性别", p.Gender)) + params = append(params, validator.NewInt64PtrParam("请提供您的全网粉丝量", p.Fans)) params = append(params, validator.NewStringPtrParam("请输入您的个性签名", p.Bio)) params = append(params, validator.NewStructPtrParam("请设置您的封面", p.Cover)) params = append(params, validator.NewStructPtrParam("请设置您的展示视频", p.Shorts)) diff --git a/app/mix/service/service.go b/app/mix/service/service.go index a8e851f1..de85bbd8 100644 --- a/app/mix/service/service.go +++ b/app/mix/service/service.go @@ -1962,8 +1962,6 @@ func (s *Service) OpApproveStreamerAuthApprovalBasic(ctx *gin.Context, req *stre midList[i] = mid streamerList[i] = &dbstruct.Streamer{ Mid: streamerAuthApprovalBasic.Mid, - Gender: streamerAuthApprovalBasic.Gender, - Fans: streamerAuthApprovalBasic.Fans, IsHided: goproto.Int64(1), } } @@ -2115,6 +2113,8 @@ func (s *Service) OpApproveStreamerAuthApprovalDetails(ctx *gin.Context, req *st for _, streamerAuthApprovalDetails := range list { streamer := &dbstruct.Streamer{ Mid: streamerAuthApprovalDetails.Mid, + Gender: streamerAuthApprovalDetails.Gender, + Fans: streamerAuthApprovalDetails.Fans, Cover: streamerAuthApprovalDetails.Cover, Shorts: streamerAuthApprovalDetails.Shorts, Album: streamerAuthApprovalDetails.Album, diff --git a/dbstruct/streamerauthapproval.go b/dbstruct/streamerauthapproval.go index 4d8d6e53..e3cb8e37 100644 --- a/dbstruct/streamerauthapproval.go +++ b/dbstruct/streamerauthapproval.go @@ -37,10 +37,8 @@ type StreamerAuthApprovalBasic struct { Mid *int64 `json:"mid" bson:"mid"` // 用户表id Avatar *MediaComponent `json:"avatar" bson:"avatar"` // 头像 Name *string `json:"name" bson:"name"` // 昵称 - Gender *int64 `json:"gender" bson:"gender"` // 性别 ContactWay *string `json:"contact_way" bson:"contact_way"` // 联系方式 AccountShot *MediaComponent `json:"account_shot" bson:"account_shot"` // 账号截图 - Fans *int64 `json:"fans" bson:"fans"` // 全网粉丝 MainPlatform *string `json:"main_platform" bson:"main_platform"` // 主营平台 ApproveStatus *int64 `json:"approve_status" bson:"approve_status"` // 审批状态 Remarks *string `json:"remarks" bson:"remarks"` // 备注 @@ -66,6 +64,8 @@ func (p *StreamerAuthApprovalBasic) GetMid() int64 { type StreamerAuthApprovalDetails struct { Id *int64 `json:"id" bson:"_id"` // 女神认证审批完善表id Mid *int64 `json:"mid" bson:"mid"` // 用户表id + Gender *int64 `json:"gender" bson:"gender"` // 性别 + Fans *int64 `json:"fans" bson:"fans"` // 全网粉丝 Bio *string `json:"bio" bson:"bio"` // 个性签名 Cover *MediaComponent `json:"cover" bson:"cover"` // 封面 Shorts *MediaComponent `json:"shorts" bson:"shorts"` // 展示视频