Merge branch 'feature-userinfo-daiyb' into dev

api/cast/cast.pb.go

@@ -485,6 +485,12 @@ type MediaUserInfo struct {
 	MediaAccountUuid   string                 `protobuf:"bytes,8,opt,name=mediaAccountUuid,proto3" json:"mediaAccountUuid"`
 	CreatedDate        string                 `protobuf:"bytes,9,opt,name=createdDate,proto3" json:"createdDate"`
 	AuthStatus         AuthStatusENUM         `protobuf:"varint,10,opt,name=authStatus,proto3,enum=Cast.AuthStatusENUM" json:"authStatus"`
+	PendingVideoCount  int32                  `protobuf:"varint,11,opt,name=pendingVideoCount,proto3" json:"pendingVideoCount"`
+	UploadedVideoCount int32                  `protobuf:"varint,12,opt,name=uploadedVideoCount,proto3" json:"uploadedVideoCount"`
+	ReleasedVideoTotal int32                  `protobuf:"varint,13,opt,name=releasedVideoTotal,proto3" json:"releasedVideoTotal"`
+	PendingPostCount   int32                  `protobuf:"varint,14,opt,name=pendingPostCount,proto3" json:"pendingPostCount"`
+	UploadedPostCount  int32                  `protobuf:"varint,15,opt,name=uploadedPostCount,proto3" json:"uploadedPostCount"`
+	ReleasedPostTotal  int32                  `protobuf:"varint,16,opt,name=releasedPostTotal,proto3" json:"releasedPostTotal"`
 	unknownFields      protoimpl.UnknownFields
 	sizeCache          protoimpl.SizeCache
 }
@@ -589,6 +595,48 @@ func (x *MediaUserInfo) GetAuthStatus() AuthStatusENUM {
 	return AuthStatusENUM_UNKNOWNAuth
 }
 
+func (x *MediaUserInfo) GetPendingVideoCount() int32 {
+	if x != nil {
+		return x.PendingVideoCount
+	}
+	return 0
+}
+
+func (x *MediaUserInfo) GetUploadedVideoCount() int32 {
+	if x != nil {
+		return x.UploadedVideoCount
+	}
+	return 0
+}
+
+func (x *MediaUserInfo) GetReleasedVideoTotal() int32 {
+	if x != nil {
+		return x.ReleasedVideoTotal
+	}
+	return 0
+}
+
+func (x *MediaUserInfo) GetPendingPostCount() int32 {
+	if x != nil {
+		return x.PendingPostCount
+	}
+	return 0
+}
+
+func (x *MediaUserInfo) GetUploadedPostCount() int32 {
+	if x != nil {
+		return x.UploadedPostCount
+	}
+	return 0
+}
+
+func (x *MediaUserInfo) GetReleasedPostTotal() int32 {
+	if x != nil {
+		return x.ReleasedPostTotal
+	}
+	return 0
+}
+
 type MediaUserListResp struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
 	Data          []*MediaUserInfo       `protobuf:"bytes,1,rep,name=data,proto3" json:"data"`
@@ -12153,7 +12201,7 @@ 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\"\x8d\x03\n" +
+	"\vmediaUserID\x18\v \x01(\tR\vmediaUserID\"\xa3\x05\n" +
 	"\rMediaUserInfo\x12*\n" +
 	"\x10platformUserName\x18\x01 \x01(\tR\x10platformUserName\x12\x1e\n" +
 	"\n" +
@@ -12173,7 +12221,13 @@ const file_pb_fiee_cast_proto_rawDesc = "" +
 	"\n" +
 	"authStatus\x18\n" +
 	" \x01(\x0e2\x14.Cast.AuthStatusENUMR\n" +
-	"authStatus\"R\n" +
+	"authStatus\x12,\n" +
+	"\x11pendingVideoCount\x18\v \x01(\x05R\x11pendingVideoCount\x12.\n" +
+	"\x12uploadedVideoCount\x18\f \x01(\x05R\x12uploadedVideoCount\x12.\n" +
+	"\x12releasedVideoTotal\x18\r \x01(\x05R\x12releasedVideoTotal\x12*\n" +
+	"\x10pendingPostCount\x18\x0e \x01(\x05R\x10pendingPostCount\x12,\n" +
+	"\x11uploadedPostCount\x18\x0f \x01(\x05R\x11uploadedPostCount\x12,\n" +
+	"\x11releasedPostTotal\x18\x10 \x01(\x05R\x11releasedPostTotal\"R\n" +
 	"\x11MediaUserListResp\x12'\n" +
 	"\x04data\x18\x01 \x03(\v2\x13.Cast.MediaUserInfoR\x04data\x12\x14\n" +
 	"\x05count\x18\x02 \x01(\x03R\x05count\"\xd1\x03\n" +

api/cast/cast.pb.validate.go

@@ -199,6 +199,18 @@ func (m *MediaUserInfo) validate(all bool) error {
 
 	// no validation rules for AuthStatus
 
+	// no validation rules for PendingVideoCount
+
+	// no validation rules for UploadedVideoCount
+
+	// no validation rules for ReleasedVideoTotal
+
+	// no validation rules for PendingPostCount
+
+	// no validation rules for UploadedPostCount
+
+	// no validation rules for ReleasedPostTotal
+
 	if len(errors) > 0 {
 		return MediaUserInfoMultiError(errors)
 	}

pkg/service/cast/media.go

@@ -37,6 +37,32 @@ func MediaUserList(ctx *gin.Context) {
 		service.Error(ctx, err)
 		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
+		}
+
+		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 {
 			_ = SyncAsAuth(v.ArtistUuid)