合并冲突
This commit is contained in:
parent
a7ac8beb3a
commit
7d14505bf4
@ -362,6 +362,7 @@ type MediaUserListReq struct {
|
||||
CreateEndDate string `protobuf:"bytes,9,opt,name=createEndDate,proto3" json:"createEndDate"`
|
||||
AuthStatus AuthStatusENUM `protobuf:"varint,10,opt,name=authStatus,proto3,enum=Cast.AuthStatusENUM" json:"authStatus"`
|
||||
MediaUserID string `protobuf:"bytes,11,opt,name=mediaUserID,proto3" json:"mediaUserID"`
|
||||
NeedStats bool `protobuf:"varint,12,opt,name=needStats,proto3" json:"needStats"`
|
||||
unknownFields protoimpl.UnknownFields
|
||||
sizeCache protoimpl.SizeCache
|
||||
}
|
||||
@ -473,6 +474,13 @@ func (x *MediaUserListReq) GetMediaUserID() string {
|
||||
return ""
|
||||
}
|
||||
|
||||
func (x *MediaUserListReq) GetNeedStats() bool {
|
||||
if x != nil {
|
||||
return x.NeedStats
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
type MediaUserInfo struct {
|
||||
state protoimpl.MessageState `protogen:"open.v1"`
|
||||
PlatformUserName string `protobuf:"bytes,1,opt,name=platformUserName,proto3" json:"platformUserName"`
|
||||
@ -6605,6 +6613,7 @@ type UpdateWorkAnalysisStatusReq struct {
|
||||
ConfirmRemark string `protobuf:"bytes,5,opt,name=confirmRemark,proto3" json:"confirmRemark"` // 确认备注
|
||||
ConfirmStatus uint32 `protobuf:"varint,6,opt,name=confirmStatus,proto3" json:"confirmStatus"` // 确认状态 1 通过 2 驳回 3 失败
|
||||
CostType uint32 `protobuf:"varint,7,opt,name=costType,proto3" json:"costType"` // 计费类型 1 套餐 2 增值
|
||||
ConfirmType uint32 `protobuf:"varint,8,opt,name=confirmType,proto3" json:"confirmType"` // 确认类型 1 艺人确认 2 系统确认
|
||||
unknownFields protoimpl.UnknownFields
|
||||
sizeCache protoimpl.SizeCache
|
||||
}
|
||||
@ -6688,6 +6697,13 @@ func (x *UpdateWorkAnalysisStatusReq) GetCostType() uint32 {
|
||||
return 0
|
||||
}
|
||||
|
||||
func (x *UpdateWorkAnalysisStatusReq) GetConfirmType() uint32 {
|
||||
if x != nil {
|
||||
return x.ConfirmType
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
type WorkAnalysisLogInfo struct {
|
||||
state protoimpl.MessageState `protogen:"open.v1"`
|
||||
WorkUuid string `protobuf:"bytes,1,opt,name=workUuid,proto3" json:"workUuid"` // 作品UUID
|
||||
@ -12180,7 +12196,7 @@ var File_pb_fiee_cast_proto protoreflect.FileDescriptor
|
||||
|
||||
const file_pb_fiee_cast_proto_rawDesc = "" +
|
||||
"\n" +
|
||||
"\x12pb/fiee/cast.proto\x12\x04Cast\x1a\x15common/wrappers.proto\x1a\x17common/descriptor.proto\x1a\x1bgoogle/protobuf/empty.proto\x1a\x15common/validate.proto\"\xaa\x03\n" +
|
||||
"\x12pb/fiee/cast.proto\x12\x04Cast\x1a\x15common/wrappers.proto\x1a\x17common/descriptor.proto\x1a\x1bgoogle/protobuf/empty.proto\x1a\x15common/validate.proto\"\xc8\x03\n" +
|
||||
"\x10MediaUserListReq\x12\x1c\n" +
|
||||
"\tartistVal\x18\x01 \x01(\tR\tartistVal\x12\x1e\n" +
|
||||
"\n" +
|
||||
@ -12201,7 +12217,8 @@ const file_pb_fiee_cast_proto_rawDesc = "" +
|
||||
"authStatus\x18\n" +
|
||||
" \x01(\x0e2\x14.Cast.AuthStatusENUMR\n" +
|
||||
"authStatus\x12 \n" +
|
||||
"\vmediaUserID\x18\v \x01(\tR\vmediaUserID\"\xa3\x05\n" +
|
||||
"\vmediaUserID\x18\v \x01(\tR\vmediaUserID\x12\x1c\n" +
|
||||
"\tneedStats\x18\f \x01(\bR\tneedStats\"\xa3\x05\n" +
|
||||
"\rMediaUserInfo\x12*\n" +
|
||||
"\x10platformUserName\x18\x01 \x01(\tR\x10platformUserName\x12\x1e\n" +
|
||||
"\n" +
|
||||
@ -12919,7 +12936,7 @@ const file_pb_fiee_cast_proto_rawDesc = "" +
|
||||
"\x0fperiodTypeViews\x18\x12 \x01(\rR\x0fperiodTypeViews\x12(\n" +
|
||||
"\x0fperiodTypeLikes\x18\x13 \x01(\rR\x0fperiodTypeLikes\x12.\n" +
|
||||
"\x12periodTypeComments\x18\x14 \x01(\rR\x12periodTypeComments\x12*\n" +
|
||||
"\x10periodTypeShares\x18\x15 \x01(\rR\x10periodTypeShares\"\x95\x02\n" +
|
||||
"\x10periodTypeShares\x18\x15 \x01(\rR\x10periodTypeShares\"\xb7\x02\n" +
|
||||
"\x1bUpdateWorkAnalysisStatusReq\x124\n" +
|
||||
"\n" +
|
||||
"workAction\x18\x01 \x01(\x0e2\x14.Cast.WorkActionENUMR\n" +
|
||||
@ -12931,7 +12948,8 @@ const file_pb_fiee_cast_proto_rawDesc = "" +
|
||||
"\rapprovalReply\x18\x04 \x01(\tR\rapprovalReply\x12$\n" +
|
||||
"\rconfirmRemark\x18\x05 \x01(\tR\rconfirmRemark\x12$\n" +
|
||||
"\rconfirmStatus\x18\x06 \x01(\rR\rconfirmStatus\x12\x1a\n" +
|
||||
"\bcostType\x18\a \x01(\rR\bcostType\"\xc9\x02\n" +
|
||||
"\bcostType\x18\a \x01(\rR\bcostType\x12 \n" +
|
||||
"\vconfirmType\x18\b \x01(\rR\vconfirmType\"\xc9\x02\n" +
|
||||
"\x13WorkAnalysisLogInfo\x12\x1a\n" +
|
||||
"\bworkUuid\x18\x01 \x01(\tR\bworkUuid\x12\x14\n" +
|
||||
"\x05title\x18\x02 \x01(\tR\x05title\x12\x1e\n" +
|
||||
|
||||
@ -79,6 +79,8 @@ func (m *MediaUserListReq) validate(all bool) error {
|
||||
|
||||
// no validation rules for MediaUserID
|
||||
|
||||
// no validation rules for NeedStats
|
||||
|
||||
if len(errors) > 0 {
|
||||
return MediaUserListReqMultiError(errors)
|
||||
}
|
||||
@ -10473,6 +10475,8 @@ func (m *UpdateWorkAnalysisStatusReq) validate(all bool) error {
|
||||
|
||||
// no validation rules for CostType
|
||||
|
||||
// no validation rules for ConfirmType
|
||||
|
||||
if len(errors) > 0 {
|
||||
return UpdateWorkAnalysisStatusReqMultiError(errors)
|
||||
}
|
||||
|
||||
@ -38,32 +38,33 @@ func MediaUserList(ctx *gin.Context) {
|
||||
return
|
||||
}
|
||||
var statResp *bundle.ArtistUploadStatsResponse
|
||||
for _, v := range resp.Data {
|
||||
statResp, err = service.BundleProvider.GetArtistUploadStatsList(context.Background(), &bundle.TaskQueryRequest{
|
||||
Keyword: v.ArtistPhone,
|
||||
Page: 0,
|
||||
PageSize: 0,
|
||||
SortBy: "",
|
||||
SortType: "",
|
||||
LastTaskAssignee: "",
|
||||
SubNums: nil,
|
||||
})
|
||||
if err != nil {
|
||||
service.Error(ctx, errors.New("查询艺人数据错误"))
|
||||
return
|
||||
if req.NeedStats {
|
||||
for _, v := range resp.Data {
|
||||
statResp, err = service.BundleProvider.GetArtistUploadStatsList(context.Background(), &bundle.TaskQueryRequest{
|
||||
Keyword: v.ArtistPhone,
|
||||
Page: 0,
|
||||
PageSize: 0,
|
||||
SortBy: "",
|
||||
SortType: "",
|
||||
LastTaskAssignee: "",
|
||||
SubNums: nil,
|
||||
})
|
||||
if err != nil {
|
||||
service.Error(ctx, errors.New("查询艺人数据错误"))
|
||||
return
|
||||
}
|
||||
if statResp != nil && len(statResp.Items) > 0 {
|
||||
info := statResp.Items[0]
|
||||
// "pendingVideoCount": 10, // 待上传视频数 "uploadedVideoCount": 25, // 已上传视频数 "releasedVideoTotal": 35, // 已释放视频总数
|
||||
//"pendingPostCount": 14, // 待上传图文数 "uploadedPostCount": 21, // 已上传图文数 "releasedPostTotal": 35, // 已释放图文总数
|
||||
v.PendingVideoCount = info.PendingVideoCount
|
||||
v.UploadedVideoCount = info.UploadedVideoCount
|
||||
v.ReleasedVideoTotal = info.ReleasedVideoTotal
|
||||
v.PendingPostCount = info.PendingPostCount
|
||||
v.UploadedPostCount = info.UploadedPostCount
|
||||
v.ReleasedPostTotal = info.ReleasedPostTotal
|
||||
}
|
||||
}
|
||||
if statResp != nil && len(statResp.Items) > 0 {
|
||||
info := statResp.Items[0]
|
||||
// "pendingVideoCount": 10, // 待上传视频数 "uploadedVideoCount": 25, // 已上传视频数 "releasedVideoTotal": 35, // 已释放视频总数
|
||||
//"pendingPostCount": 14, // 待上传图文数 "uploadedPostCount": 21, // 已上传图文数 "releasedPostTotal": 35, // 已释放图文总数
|
||||
v.PendingVideoCount = info.PendingVideoCount
|
||||
v.UploadedVideoCount = info.UploadedVideoCount
|
||||
v.ReleasedVideoTotal = info.ReleasedVideoTotal
|
||||
v.PendingPostCount = info.PendingPostCount
|
||||
v.UploadedPostCount = info.UploadedPostCount
|
||||
v.ReleasedPostTotal = info.ReleasedPostTotal
|
||||
}
|
||||
|
||||
}
|
||||
go func() {
|
||||
for _, v := range resp.Data {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user