Updata：解决冲突

api/bundle/bundle.validator.pb.go

@@ -365,12 +365,6 @@ func (this *BatchGetValueAddServiceLangResponse) Validate() error {
 	}
 	return nil
 }
-func (this *UpdateBundleBalanceReq) Validate() error {
-	return nil
-}
-func (this *UpdateBundleBalanceResp) Validate() error {
-	return nil
-}
 func (this *BundleExtendRequest) Validate() error {
 	return nil
 }

api/bundle/bundle_triple.pb.go

@@ -64,7 +64,6 @@ type BundleClient interface {
 	BatchGetValueAddServiceLang(ctx context.Context, in *BatchGetValueAddServiceLangRequest, opts ...grpc_go.CallOption) (*BatchGetValueAddServiceLangResponse, common.ErrorWithAttachment)
 	DeleteValueAddService(ctx context.Context, in *DeleteValueAddServiceRequest, opts ...grpc_go.CallOption) (*CommonResponse, common.ErrorWithAttachment)
 	// 余量管理
-	UpdateBundleBalance(ctx context.Context, in *UpdateBundleBalanceReq, opts ...grpc_go.CallOption) (*UpdateBundleBalanceResp, common.ErrorWithAttachment)
 	BundleExtend(ctx context.Context, in *BundleExtendRequest, opts ...grpc_go.CallOption) (*BundleExtendResponse, common.ErrorWithAttachment)
 	BundleExtendRecordsList(ctx context.Context, in *BundleExtendRecordsListRequest, opts ...grpc_go.CallOption) (*BundleExtendRecordsListResponse, common.ErrorWithAttachment)
 	GetBundleBalanceList(ctx context.Context, in *GetBundleBalanceListReq, opts ...grpc_go.CallOption) (*GetBundleBalanceListResp, common.ErrorWithAttachment)
@@ -105,6 +104,12 @@ type BundleClient interface {
 	BatchAssignTask(ctx context.Context, in *BatchAssignTaskRequest, opts ...grpc_go.CallOption) (*ComResponse, common.ErrorWithAttachment)
 	BatchTerminateTask(ctx context.Context, in *BatchTerminateTaskRequest, opts ...grpc_go.CallOption) (*ComResponse, common.ErrorWithAttachment)
 	GetArtistUploadStatsList(ctx context.Context, in *TaskQueryRequest, opts ...grpc_go.CallOption) (*ArtistUploadStatsResponse, common.ErrorWithAttachment)
+	GetPendingTaskLayout(ctx context.Context, in *GetPendingTaskLayoutReq, opts ...grpc_go.CallOption) (*GetPendingTaskLayoutResp, common.ErrorWithAttachment)
+	SetPendingTaskLayout(ctx context.Context, in *SetPendingTaskLayoutReq, opts ...grpc_go.CallOption) (*SetPendingTaskLayoutResp, common.ErrorWithAttachment)
+	GetPendingUploadBreakdown(ctx context.Context, in *PendingUploadBreakdownRequest, opts ...grpc_go.CallOption) (*PendingUploadBreakdownResponse, common.ErrorWithAttachment)
+	GetPendingAssign(ctx context.Context, in *PendingAssignRequest, opts ...grpc_go.CallOption) (*PendingAssignResponse, common.ErrorWithAttachment)
+	RevertTaskCompletionByUUIDItem(ctx context.Context, in *RevertTaskCompletionByUUIDItemRequest, opts ...grpc_go.CallOption) (*ComResponse, common.ErrorWithAttachment)
+	AddHiddenTaskAssignee(ctx context.Context, in *AddHiddenTaskAssigneeRequest, opts ...grpc_go.CallOption) (*ComResponse, common.ErrorWithAttachment)
 	CreateTaskWorkLog(ctx context.Context, in *CreateTaskWorkLogRequest, opts ...grpc_go.CallOption) (*CommonResponse, common.ErrorWithAttachment)
 	// 数据指标
 	MetricsBusiness(ctx context.Context, in *MetricsBusinessReq, opts ...grpc_go.CallOption) (*MetricsBusinessResp, common.ErrorWithAttachment)
@@ -113,12 +118,6 @@ type BundleClient interface {
 	MetricsBundlePurchaseExport(ctx context.Context, in *MetricsBundlePurchaseExportReq, opts ...grpc_go.CallOption) (*MetricsBundlePurchaseExportResp, common.ErrorWithAttachment)
 	MetricsArtistAccountExport(ctx context.Context, in *MetricsArtistAccountExportReq, opts ...grpc_go.CallOption) (*MetricsArtistAccountExportResp, common.ErrorWithAttachment)
 	MetricsVideoSubmitExport(ctx context.Context, in *MetricsVideoSubmitExportReq, opts ...grpc_go.CallOption) (*MetricsVideoSubmitExportResp, common.ErrorWithAttachment)
-	GetPendingTaskLayout(ctx context.Context, in *GetPendingTaskLayoutReq, opts ...grpc_go.CallOption) (*GetPendingTaskLayoutResp, common.ErrorWithAttachment)
-	SetPendingTaskLayout(ctx context.Context, in *SetPendingTaskLayoutReq, opts ...grpc_go.CallOption) (*SetPendingTaskLayoutResp, common.ErrorWithAttachment)
-	GetPendingUploadBreakdown(ctx context.Context, in *PendingUploadBreakdownRequest, opts ...grpc_go.CallOption) (*PendingUploadBreakdownResponse, common.ErrorWithAttachment)
-	GetPendingAssign(ctx context.Context, in *PendingAssignRequest, opts ...grpc_go.CallOption) (*PendingAssignResponse, common.ErrorWithAttachment)
-	RevertTaskCompletionByUUIDItem(ctx context.Context, in *RevertTaskCompletionByUUIDItemRequest, opts ...grpc_go.CallOption) (*ComResponse, common.ErrorWithAttachment)
-	AddHiddenTaskAssignee(ctx context.Context, in *AddHiddenTaskAssigneeRequest, opts ...grpc_go.CallOption) (*ComResponse, common.ErrorWithAttachment)
 	QueryTheOrderSnapshotInformation(ctx context.Context, in *QueryTheOrderSnapshotInformationReq, opts ...grpc_go.CallOption) (*QueryTheOrderSnapshotInformationResp, common.ErrorWithAttachment)
 }
 
@@ -160,7 +159,6 @@ type BundleClientImpl struct {
 	CalculatePrice                           func(ctx context.Context, in *CalculatePriceRequest) (*CalculatePriceResponse, error)
 	BatchGetValueAddServiceLang              func(ctx context.Context, in *BatchGetValueAddServiceLangRequest) (*BatchGetValueAddServiceLangResponse, error)
 	DeleteValueAddService                    func(ctx context.Context, in *DeleteValueAddServiceRequest) (*CommonResponse, error)
-	UpdateBundleBalance                      func(ctx context.Context, in *UpdateBundleBalanceReq) (*UpdateBundleBalanceResp, error)
 	BundleExtend                             func(ctx context.Context, in *BundleExtendRequest) (*BundleExtendResponse, error)
 	BundleExtendRecordsList                  func(ctx context.Context, in *BundleExtendRecordsListRequest) (*BundleExtendRecordsListResponse, error)
 	GetBundleBalanceList                     func(ctx context.Context, in *GetBundleBalanceListReq) (*GetBundleBalanceListResp, error)
@@ -197,6 +195,12 @@ type BundleClientImpl struct {
 	BatchAssignTask                          func(ctx context.Context, in *BatchAssignTaskRequest) (*ComResponse, error)
 	BatchTerminateTask                       func(ctx context.Context, in *BatchTerminateTaskRequest) (*ComResponse, error)
 	GetArtistUploadStatsList                 func(ctx context.Context, in *TaskQueryRequest) (*ArtistUploadStatsResponse, error)
+	GetPendingTaskLayout                     func(ctx context.Context, in *GetPendingTaskLayoutReq) (*GetPendingTaskLayoutResp, error)
+	SetPendingTaskLayout                     func(ctx context.Context, in *SetPendingTaskLayoutReq) (*SetPendingTaskLayoutResp, error)
+	GetPendingUploadBreakdown                func(ctx context.Context, in *PendingUploadBreakdownRequest) (*PendingUploadBreakdownResponse, error)
+	GetPendingAssign                         func(ctx context.Context, in *PendingAssignRequest) (*PendingAssignResponse, error)
+	RevertTaskCompletionByUUIDItem           func(ctx context.Context, in *RevertTaskCompletionByUUIDItemRequest) (*ComResponse, error)
+	AddHiddenTaskAssignee                    func(ctx context.Context, in *AddHiddenTaskAssigneeRequest) (*ComResponse, error)
 	CreateTaskWorkLog                        func(ctx context.Context, in *CreateTaskWorkLogRequest) (*CommonResponse, error)
 	MetricsBusiness                          func(ctx context.Context, in *MetricsBusinessReq) (*MetricsBusinessResp, error)
 	MetricsOperatingCreate                   func(ctx context.Context, in *MetricsOperatingCreateReq) (*MetricsOperatingCreateResp, error)
@@ -204,12 +208,6 @@ type BundleClientImpl struct {
 	MetricsBundlePurchaseExport              func(ctx context.Context, in *MetricsBundlePurchaseExportReq) (*MetricsBundlePurchaseExportResp, error)
 	MetricsArtistAccountExport               func(ctx context.Context, in *MetricsArtistAccountExportReq) (*MetricsArtistAccountExportResp, error)
 	MetricsVideoSubmitExport                 func(ctx context.Context, in *MetricsVideoSubmitExportReq) (*MetricsVideoSubmitExportResp, error)
-	GetPendingTaskLayout                     func(ctx context.Context, in *GetPendingTaskLayoutReq) (*GetPendingTaskLayoutResp, error)
-	SetPendingTaskLayout                     func(ctx context.Context, in *SetPendingTaskLayoutReq) (*SetPendingTaskLayoutResp, error)
-	GetPendingUploadBreakdown                func(ctx context.Context, in *PendingUploadBreakdownRequest) (*PendingUploadBreakdownResponse, error)
-	GetPendingAssign                         func(ctx context.Context, in *PendingAssignRequest) (*PendingAssignResponse, error)
-	RevertTaskCompletionByUUIDItem           func(ctx context.Context, in *RevertTaskCompletionByUUIDItemRequest) (*ComResponse, error)
-	AddHiddenTaskAssignee                    func(ctx context.Context, in *AddHiddenTaskAssigneeRequest) (*ComResponse, error)
 	QueryTheOrderSnapshotInformation         func(ctx context.Context, in *QueryTheOrderSnapshotInformationReq) (*QueryTheOrderSnapshotInformationResp, error)
 }
 
@@ -423,12 +421,6 @@ func (c *bundleClient) DeleteValueAddService(ctx context.Context, in *DeleteValu
 	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/DeleteValueAddService", in, out)
 }
 
-func (c *bundleClient) UpdateBundleBalance(ctx context.Context, in *UpdateBundleBalanceReq, opts ...grpc_go.CallOption) (*UpdateBundleBalanceResp, common.ErrorWithAttachment) {
-	out := new(UpdateBundleBalanceResp)
-	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
-	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/UpdateBundleBalance", in, out)
-}
-
 func (c *bundleClient) BundleExtend(ctx context.Context, in *BundleExtendRequest, opts ...grpc_go.CallOption) (*BundleExtendResponse, common.ErrorWithAttachment) {
 	out := new(BundleExtendResponse)
 	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
@@ -645,6 +637,42 @@ func (c *bundleClient) GetArtistUploadStatsList(ctx context.Context, in *TaskQue
 	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/GetArtistUploadStatsList", in, out)
 }
 
+func (c *bundleClient) GetPendingTaskLayout(ctx context.Context, in *GetPendingTaskLayoutReq, opts ...grpc_go.CallOption) (*GetPendingTaskLayoutResp, common.ErrorWithAttachment) {
+	out := new(GetPendingTaskLayoutResp)
+	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
+	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/GetPendingTaskLayout", in, out)
+}
+
+func (c *bundleClient) SetPendingTaskLayout(ctx context.Context, in *SetPendingTaskLayoutReq, opts ...grpc_go.CallOption) (*SetPendingTaskLayoutResp, common.ErrorWithAttachment) {
+	out := new(SetPendingTaskLayoutResp)
+	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
+	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/SetPendingTaskLayout", in, out)
+}
+
+func (c *bundleClient) GetPendingUploadBreakdown(ctx context.Context, in *PendingUploadBreakdownRequest, opts ...grpc_go.CallOption) (*PendingUploadBreakdownResponse, common.ErrorWithAttachment) {
+	out := new(PendingUploadBreakdownResponse)
+	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
+	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/GetPendingUploadBreakdown", in, out)
+}
+
+func (c *bundleClient) GetPendingAssign(ctx context.Context, in *PendingAssignRequest, opts ...grpc_go.CallOption) (*PendingAssignResponse, common.ErrorWithAttachment) {
+	out := new(PendingAssignResponse)
+	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
+	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/GetPendingAssign", in, out)
+}
+
+func (c *bundleClient) RevertTaskCompletionByUUIDItem(ctx context.Context, in *RevertTaskCompletionByUUIDItemRequest, opts ...grpc_go.CallOption) (*ComResponse, common.ErrorWithAttachment) {
+	out := new(ComResponse)
+	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
+	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/RevertTaskCompletionByUUIDItem", in, out)
+}
+
+func (c *bundleClient) AddHiddenTaskAssignee(ctx context.Context, in *AddHiddenTaskAssigneeRequest, opts ...grpc_go.CallOption) (*ComResponse, common.ErrorWithAttachment) {
+	out := new(ComResponse)
+	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
+	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/AddHiddenTaskAssignee", in, out)
+}
+
 func (c *bundleClient) CreateTaskWorkLog(ctx context.Context, in *CreateTaskWorkLogRequest, opts ...grpc_go.CallOption) (*CommonResponse, common.ErrorWithAttachment) {
 	out := new(CommonResponse)
 	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
@@ -687,42 +715,6 @@ func (c *bundleClient) MetricsVideoSubmitExport(ctx context.Context, in *Metrics
 	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/MetricsVideoSubmitExport", in, out)
 }
 
-func (c *bundleClient) GetPendingTaskLayout(ctx context.Context, in *GetPendingTaskLayoutReq, opts ...grpc_go.CallOption) (*GetPendingTaskLayoutResp, common.ErrorWithAttachment) {
-	out := new(GetPendingTaskLayoutResp)
-	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
-	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/GetPendingTaskLayout", in, out)
-}
-
-func (c *bundleClient) SetPendingTaskLayout(ctx context.Context, in *SetPendingTaskLayoutReq, opts ...grpc_go.CallOption) (*SetPendingTaskLayoutResp, common.ErrorWithAttachment) {
-	out := new(SetPendingTaskLayoutResp)
-	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
-	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/SetPendingTaskLayout", in, out)
-}
-
-func (c *bundleClient) GetPendingUploadBreakdown(ctx context.Context, in *PendingUploadBreakdownRequest, opts ...grpc_go.CallOption) (*PendingUploadBreakdownResponse, common.ErrorWithAttachment) {
-	out := new(PendingUploadBreakdownResponse)
-	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
-	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/GetPendingUploadBreakdown", in, out)
-}
-
-func (c *bundleClient) GetPendingAssign(ctx context.Context, in *PendingAssignRequest, opts ...grpc_go.CallOption) (*PendingAssignResponse, common.ErrorWithAttachment) {
-	out := new(PendingAssignResponse)
-	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
-	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/GetPendingAssign", in, out)
-}
-
-func (c *bundleClient) RevertTaskCompletionByUUIDItem(ctx context.Context, in *RevertTaskCompletionByUUIDItemRequest, opts ...grpc_go.CallOption) (*ComResponse, common.ErrorWithAttachment) {
-	out := new(ComResponse)
-	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
-	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/RevertTaskCompletionByUUIDItem", in, out)
-}
-
-func (c *bundleClient) AddHiddenTaskAssignee(ctx context.Context, in *AddHiddenTaskAssigneeRequest, opts ...grpc_go.CallOption) (*ComResponse, common.ErrorWithAttachment) {
-	out := new(ComResponse)
-	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
-	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/AddHiddenTaskAssignee", in, out)
-}
-
 func (c *bundleClient) QueryTheOrderSnapshotInformation(ctx context.Context, in *QueryTheOrderSnapshotInformationReq, opts ...grpc_go.CallOption) (*QueryTheOrderSnapshotInformationResp, common.ErrorWithAttachment) {
 	out := new(QueryTheOrderSnapshotInformationResp)
 	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
@@ -769,7 +761,6 @@ type BundleServer interface {
 	BatchGetValueAddServiceLang(context.Context, *BatchGetValueAddServiceLangRequest) (*BatchGetValueAddServiceLangResponse, error)
 	DeleteValueAddService(context.Context, *DeleteValueAddServiceRequest) (*CommonResponse, error)
 	// 余量管理
-	UpdateBundleBalance(context.Context, *UpdateBundleBalanceReq) (*UpdateBundleBalanceResp, error)
 	BundleExtend(context.Context, *BundleExtendRequest) (*BundleExtendResponse, error)
 	BundleExtendRecordsList(context.Context, *BundleExtendRecordsListRequest) (*BundleExtendRecordsListResponse, error)
 	GetBundleBalanceList(context.Context, *GetBundleBalanceListReq) (*GetBundleBalanceListResp, error)
@@ -810,6 +801,12 @@ type BundleServer interface {
 	BatchAssignTask(context.Context, *BatchAssignTaskRequest) (*ComResponse, error)
 	BatchTerminateTask(context.Context, *BatchTerminateTaskRequest) (*ComResponse, error)
 	GetArtistUploadStatsList(context.Context, *TaskQueryRequest) (*ArtistUploadStatsResponse, error)
+	GetPendingTaskLayout(context.Context, *GetPendingTaskLayoutReq) (*GetPendingTaskLayoutResp, error)
+	SetPendingTaskLayout(context.Context, *SetPendingTaskLayoutReq) (*SetPendingTaskLayoutResp, error)
+	GetPendingUploadBreakdown(context.Context, *PendingUploadBreakdownRequest) (*PendingUploadBreakdownResponse, error)
+	GetPendingAssign(context.Context, *PendingAssignRequest) (*PendingAssignResponse, error)
+	RevertTaskCompletionByUUIDItem(context.Context, *RevertTaskCompletionByUUIDItemRequest) (*ComResponse, error)
+	AddHiddenTaskAssignee(context.Context, *AddHiddenTaskAssigneeRequest) (*ComResponse, error)
 	CreateTaskWorkLog(context.Context, *CreateTaskWorkLogRequest) (*CommonResponse, error)
 	// 数据指标
 	MetricsBusiness(context.Context, *MetricsBusinessReq) (*MetricsBusinessResp, error)
@@ -818,12 +815,6 @@ type BundleServer interface {
 	MetricsBundlePurchaseExport(context.Context, *MetricsBundlePurchaseExportReq) (*MetricsBundlePurchaseExportResp, error)
 	MetricsArtistAccountExport(context.Context, *MetricsArtistAccountExportReq) (*MetricsArtistAccountExportResp, error)
 	MetricsVideoSubmitExport(context.Context, *MetricsVideoSubmitExportReq) (*MetricsVideoSubmitExportResp, error)
-	GetPendingTaskLayout(context.Context, *GetPendingTaskLayoutReq) (*GetPendingTaskLayoutResp, error)
-	SetPendingTaskLayout(context.Context, *SetPendingTaskLayoutReq) (*SetPendingTaskLayoutResp, error)
-	GetPendingUploadBreakdown(context.Context, *PendingUploadBreakdownRequest) (*PendingUploadBreakdownResponse, error)
-	GetPendingAssign(context.Context, *PendingAssignRequest) (*PendingAssignResponse, error)
-	RevertTaskCompletionByUUIDItem(context.Context, *RevertTaskCompletionByUUIDItemRequest) (*ComResponse, error)
-	AddHiddenTaskAssignee(context.Context, *AddHiddenTaskAssigneeRequest) (*ComResponse, error)
 	QueryTheOrderSnapshotInformation(context.Context, *QueryTheOrderSnapshotInformationReq) (*QueryTheOrderSnapshotInformationResp, error)
 	mustEmbedUnimplementedBundleServer()
 }
@@ -932,9 +923,6 @@ func (UnimplementedBundleServer) BatchGetValueAddServiceLang(context.Context, *B
 func (UnimplementedBundleServer) DeleteValueAddService(context.Context, *DeleteValueAddServiceRequest) (*CommonResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteValueAddService not implemented")
 }
-func (UnimplementedBundleServer) UpdateBundleBalance(context.Context, *UpdateBundleBalanceReq) (*UpdateBundleBalanceResp, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method UpdateBundleBalance not implemented")
-}
 func (UnimplementedBundleServer) BundleExtend(context.Context, *BundleExtendRequest) (*BundleExtendResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method BundleExtend not implemented")
 }
@@ -1043,6 +1031,24 @@ func (UnimplementedBundleServer) BatchTerminateTask(context.Context, *BatchTermi
 func (UnimplementedBundleServer) GetArtistUploadStatsList(context.Context, *TaskQueryRequest) (*ArtistUploadStatsResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetArtistUploadStatsList not implemented")
 }
+func (UnimplementedBundleServer) GetPendingTaskLayout(context.Context, *GetPendingTaskLayoutReq) (*GetPendingTaskLayoutResp, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetPendingTaskLayout not implemented")
+}
+func (UnimplementedBundleServer) SetPendingTaskLayout(context.Context, *SetPendingTaskLayoutReq) (*SetPendingTaskLayoutResp, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method SetPendingTaskLayout not implemented")
+}
+func (UnimplementedBundleServer) GetPendingUploadBreakdown(context.Context, *PendingUploadBreakdownRequest) (*PendingUploadBreakdownResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetPendingUploadBreakdown not implemented")
+}
+func (UnimplementedBundleServer) GetPendingAssign(context.Context, *PendingAssignRequest) (*PendingAssignResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetPendingAssign not implemented")
+}
+func (UnimplementedBundleServer) RevertTaskCompletionByUUIDItem(context.Context, *RevertTaskCompletionByUUIDItemRequest) (*ComResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method RevertTaskCompletionByUUIDItem not implemented")
+}
+func (UnimplementedBundleServer) AddHiddenTaskAssignee(context.Context, *AddHiddenTaskAssigneeRequest) (*ComResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method AddHiddenTaskAssignee not implemented")
+}
 func (UnimplementedBundleServer) CreateTaskWorkLog(context.Context, *CreateTaskWorkLogRequest) (*CommonResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method CreateTaskWorkLog not implemented")
 }
@@ -1064,24 +1070,6 @@ func (UnimplementedBundleServer) MetricsArtistAccountExport(context.Context, *Me
 func (UnimplementedBundleServer) MetricsVideoSubmitExport(context.Context, *MetricsVideoSubmitExportReq) (*MetricsVideoSubmitExportResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method MetricsVideoSubmitExport not implemented")
 }
-func (UnimplementedBundleServer) GetPendingTaskLayout(context.Context, *GetPendingTaskLayoutReq) (*GetPendingTaskLayoutResp, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetPendingTaskLayout not implemented")
-}
-func (UnimplementedBundleServer) SetPendingTaskLayout(context.Context, *SetPendingTaskLayoutReq) (*SetPendingTaskLayoutResp, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method SetPendingTaskLayout not implemented")
-}
-func (UnimplementedBundleServer) GetPendingUploadBreakdown(context.Context, *PendingUploadBreakdownRequest) (*PendingUploadBreakdownResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetPendingUploadBreakdown not implemented")
-}
-func (UnimplementedBundleServer) GetPendingAssign(context.Context, *PendingAssignRequest) (*PendingAssignResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetPendingAssign not implemented")
-}
-func (UnimplementedBundleServer) RevertTaskCompletionByUUIDItem(context.Context, *RevertTaskCompletionByUUIDItemRequest) (*ComResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method RevertTaskCompletionByUUIDItem not implemented")
-}
-func (UnimplementedBundleServer) AddHiddenTaskAssignee(context.Context, *AddHiddenTaskAssigneeRequest) (*ComResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method AddHiddenTaskAssignee not implemented")
-}
 func (UnimplementedBundleServer) QueryTheOrderSnapshotInformation(context.Context, *QueryTheOrderSnapshotInformationReq) (*QueryTheOrderSnapshotInformationResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method QueryTheOrderSnapshotInformation not implemented")
 }
@@ -2070,35 +2058,6 @@ func _Bundle_DeleteValueAddService_Handler(srv interface{}, ctx context.Context,
 	return interceptor(ctx, in, info, handler)
 }
 
-func _Bundle_UpdateBundleBalance_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
-	in := new(UpdateBundleBalanceReq)
-	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("UpdateBundleBalance", 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 _Bundle_BundleExtend_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
 	in := new(BundleExtendRequest)
 	if err := dec(in); err != nil {
@@ -3143,6 +3102,180 @@ func _Bundle_GetArtistUploadStatsList_Handler(srv interface{}, ctx context.Conte
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Bundle_GetPendingTaskLayout_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetPendingTaskLayoutReq)
+	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("GetPendingTaskLayout", 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 _Bundle_SetPendingTaskLayout_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SetPendingTaskLayoutReq)
+	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("SetPendingTaskLayout", 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 _Bundle_GetPendingUploadBreakdown_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
+	in := new(PendingUploadBreakdownRequest)
+	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("GetPendingUploadBreakdown", 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 _Bundle_GetPendingAssign_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
+	in := new(PendingAssignRequest)
+	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("GetPendingAssign", 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 _Bundle_RevertTaskCompletionByUUIDItem_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
+	in := new(RevertTaskCompletionByUUIDItemRequest)
+	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("RevertTaskCompletionByUUIDItem", 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 _Bundle_AddHiddenTaskAssignee_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
+	in := new(AddHiddenTaskAssigneeRequest)
+	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("AddHiddenTaskAssignee", 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 _Bundle_CreateTaskWorkLog_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
 	in := new(CreateTaskWorkLogRequest)
 	if err := dec(in); err != nil {
@@ -3346,180 +3479,6 @@ func _Bundle_MetricsVideoSubmitExport_Handler(srv interface{}, ctx context.Conte
 	return interceptor(ctx, in, info, handler)
 }
 
-func _Bundle_GetPendingTaskLayout_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GetPendingTaskLayoutReq)
-	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("GetPendingTaskLayout", 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 _Bundle_SetPendingTaskLayout_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
-	in := new(SetPendingTaskLayoutReq)
-	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("SetPendingTaskLayout", 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 _Bundle_GetPendingUploadBreakdown_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
-	in := new(PendingUploadBreakdownRequest)
-	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("GetPendingUploadBreakdown", 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 _Bundle_GetPendingAssign_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
-	in := new(PendingAssignRequest)
-	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("GetPendingAssign", 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 _Bundle_RevertTaskCompletionByUUIDItem_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
-	in := new(RevertTaskCompletionByUUIDItemRequest)
-	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("RevertTaskCompletionByUUIDItem", 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 _Bundle_AddHiddenTaskAssignee_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
-	in := new(AddHiddenTaskAssigneeRequest)
-	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("AddHiddenTaskAssignee", 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 _Bundle_QueryTheOrderSnapshotInformation_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
 	in := new(QueryTheOrderSnapshotInformationReq)
 	if err := dec(in); err != nil {
@@ -3688,10 +3647,6 @@ var Bundle_ServiceDesc = grpc_go.ServiceDesc{
 			MethodName: "DeleteValueAddService",
 			Handler:    _Bundle_DeleteValueAddService_Handler,
 		},
-		{
-			MethodName: "UpdateBundleBalance",
-			Handler:    _Bundle_UpdateBundleBalance_Handler,
-		},
 		{
 			MethodName: "BundleExtend",
 			Handler:    _Bundle_BundleExtend_Handler,
@@ -3836,6 +3791,30 @@ var Bundle_ServiceDesc = grpc_go.ServiceDesc{
 			MethodName: "GetArtistUploadStatsList",
 			Handler:    _Bundle_GetArtistUploadStatsList_Handler,
 		},
+		{
+			MethodName: "GetPendingTaskLayout",
+			Handler:    _Bundle_GetPendingTaskLayout_Handler,
+		},
+		{
+			MethodName: "SetPendingTaskLayout",
+			Handler:    _Bundle_SetPendingTaskLayout_Handler,
+		},
+		{
+			MethodName: "GetPendingUploadBreakdown",
+			Handler:    _Bundle_GetPendingUploadBreakdown_Handler,
+		},
+		{
+			MethodName: "GetPendingAssign",
+			Handler:    _Bundle_GetPendingAssign_Handler,
+		},
+		{
+			MethodName: "RevertTaskCompletionByUUIDItem",
+			Handler:    _Bundle_RevertTaskCompletionByUUIDItem_Handler,
+		},
+		{
+			MethodName: "AddHiddenTaskAssignee",
+			Handler:    _Bundle_AddHiddenTaskAssignee_Handler,
+		},
 		{
 			MethodName: "CreateTaskWorkLog",
 			Handler:    _Bundle_CreateTaskWorkLog_Handler,
@@ -3864,30 +3843,6 @@ var Bundle_ServiceDesc = grpc_go.ServiceDesc{
 			MethodName: "MetricsVideoSubmitExport",
 			Handler:    _Bundle_MetricsVideoSubmitExport_Handler,
 		},
-		{
-			MethodName: "GetPendingTaskLayout",
-			Handler:    _Bundle_GetPendingTaskLayout_Handler,
-		},
-		{
-			MethodName: "SetPendingTaskLayout",
-			Handler:    _Bundle_SetPendingTaskLayout_Handler,
-		},
-		{
-			MethodName: "GetPendingUploadBreakdown",
-			Handler:    _Bundle_GetPendingUploadBreakdown_Handler,
-		},
-		{
-			MethodName: "GetPendingAssign",
-			Handler:    _Bundle_GetPendingAssign_Handler,
-		},
-		{
-			MethodName: "RevertTaskCompletionByUUIDItem",
-			Handler:    _Bundle_RevertTaskCompletionByUUIDItem_Handler,
-		},
-		{
-			MethodName: "AddHiddenTaskAssignee",
-			Handler:    _Bundle_AddHiddenTaskAssignee_Handler,
-		},
 		{
 			MethodName: "QueryTheOrderSnapshotInformation",
 			Handler:    _Bundle_QueryTheOrderSnapshotInformation_Handler,

pkg/logic/cast/work.go

@@ -79,7 +79,7 @@ func (w *Work) ExportExcelWorkList(data []*cast.WorkListResp_Info) (*excelize.Fi
 			info.Remark,
 			mediaAccountNames,
 			managerNames,
-			info.Status1Time,
+			info.SubmitTime,
 			info.Status4Time,
 			info.Status9Time,
 			info.Status6Time,

pkg/service/bundle/bundleBalance.go

@@ -452,6 +452,7 @@ func writeToExcel(filename string, items []*bundle.BundleBalanceExportItem) erro
 		"所属月份", "用户编号", "姓名", "手机号", "购买套餐时间",
 		"套餐金额", "增值服务金额", "支付金额", "币种", "手续费",
 		"套餐视频总数", "增值服务视频总数", "套餐视频单价", "增值视频单价",
+		"当月消耗套餐金额($)", "当月消耗增值金额($)",
 		"套餐账号总数", "增值账号总数", "套餐账号使用数", "增值账号使用数",
 		"当前可用套餐视频数", "当前可用增值视频数", "当前已用套餐视频数", "当前已用增值视频数", "当前作废套餐视频数", "当前作废增值视频数", "当月新增可用套餐视频数", "当月新增可用增值视频数", "当月使用套餐视频数", "当月使用增值视频数", "当月作废套餐视频数", "当月作废增值视频数",
 		"当前可用套餐图文数", "当前可用增值图文数", "当前已用套餐图文数", "当前已用增值图文数", "当前作废套餐图文数", "当前作废增值图文数", "当月新增可用套餐图文数", "当月新增可用增值图文数", "当月使用套餐图文数", "当月使用增值图文数", "当月作废套餐图文数", "当月作废增值图文数",
@@ -495,80 +496,92 @@ func writeToExcel(filename string, items []*bundle.BundleBalanceExportItem) erro
 		_ = write(13, fmt.Sprintf("%.2f", it.BundleVideoUnitPrice))
 		_ = write(14, fmt.Sprintf("%.2f", it.IncreaseVideoUnitPrice))
 
+		// 当月视频消耗金额($)
+		monthlyBundleVideoConsumptionPrice, err := strconv.ParseFloat(it.MonthlyBundleVideoConsumptionPrice, 64)
+		if err != nil {
+			return err
+		}
+		monthlyIncreaseVideoConsumptionPrice, err := strconv.ParseFloat(it.MonthlyIncreaseVideoConsumptionPrice, 64)
+		if err != nil {
+			return err
+		}
+		_ = write(15, fmt.Sprintf("%.2f", monthlyBundleVideoConsumptionPrice))
+		_ = write(16, fmt.Sprintf("%.2f", monthlyIncreaseVideoConsumptionPrice))
+
 		// 账号类
-		_ = write(15, int(it.BundleAccountNumber))
+		_ = write(17, int(it.BundleAccountNumber))
-		_ = write(16, int(it.IncreaseAccountNumber))
+		_ = write(18, int(it.IncreaseAccountNumber))
-		_ = write(17, int(it.BundleAccountConsumptionNumber))
+		_ = write(19, int(it.BundleAccountConsumptionNumber))
-		_ = write(18, int(it.IncreaseAccountConsumptionNumber))
+		_ = write(20, int(it.IncreaseAccountConsumptionNumber))
 
 		// 视频类
-		_ = write(19, int(it.MonthlyBundleVideoNumber))
+		_ = write(21, int(it.MonthlyBundleVideoNumber))
-		_ = write(20, int(it.MonthlyIncreaseVideoNumber))
+		_ = write(22, int(it.MonthlyIncreaseVideoNumber))
-		_ = write(21, int(it.BundleVideoConsumptionNumber))
+		_ = write(23, int(it.BundleVideoConsumptionNumber))
-		_ = write(22, int(it.IncreaseVideoConsumptionNumber))
+		_ = write(24, int(it.IncreaseVideoConsumptionNumber))
-		_ = write(23, int(it.InvalidBundleVideoNumber))
+		_ = write(25, int(it.InvalidBundleVideoNumber))
-		_ = write(24, int(it.InvalidIncreaseVideoNumber))
+		_ = write(26, int(it.InvalidIncreaseVideoNumber))
-		_ = write(25, int(it.MonthlyNewBundleVideoNumber))
+		_ = write(27, int(it.MonthlyNewBundleVideoNumber))
-		_ = write(26, int(it.MonthlyNewIncreaseVideoNumber))
+		_ = write(28, int(it.MonthlyNewIncreaseVideoNumber))
-		_ = write(27, int(it.MonthlyBundleVideoConsumptionNumber))
+		_ = write(29, int(it.MonthlyBundleVideoConsumptionNumber))
-		_ = write(28, int(it.MonthlyIncreaseVideoConsumptionNumber))
+		_ = write(30, int(it.MonthlyIncreaseVideoConsumptionNumber))
-		_ = write(29, int(it.MonthlyInvalidBundleVideoNumber))
+		_ = write(31, int(it.MonthlyInvalidBundleVideoNumber))
-		_ = write(30, int(it.MonthlyInvalidIncreaseVideoNumber))
+		_ = write(32, int(it.MonthlyInvalidIncreaseVideoNumber))
 
 		// 图文类
-		_ = write(31, int(it.MonthlyBundleImageNumber))
+		_ = write(33, int(it.MonthlyBundleImageNumber))
-		_ = write(32, int(it.MonthlyIncreaseImageNumber))
+		_ = write(34, int(it.MonthlyIncreaseImageNumber))
-		_ = write(33, int(it.BundleImageConsumptionNumber))
+		_ = write(35, int(it.BundleImageConsumptionNumber))
-		_ = write(34, int(it.IncreaseImageConsumptionNumber))
+		_ = write(36, int(it.IncreaseImageConsumptionNumber))
-		_ = write(35, int(it.InvalidBundleImageNumber))
+		_ = write(37, int(it.InvalidBundleImageNumber))
-		_ = write(36, int(it.InvalidIncreaseImageNumber))
+		_ = write(38, int(it.InvalidIncreaseImageNumber))
-		_ = write(37, int(it.MonthlyNewBundleImageNumber))
+		_ = write(39, int(it.MonthlyNewBundleImageNumber))
-		_ = write(38, int(it.MonthlyNewIncreaseImageNumber))
+		_ = write(40, int(it.MonthlyNewIncreaseImageNumber))
-		_ = write(39, int(it.MonthlyBundleImageConsumptionNumber))
+		_ = write(41, int(it.MonthlyBundleImageConsumptionNumber))
-		_ = write(40, int(it.MonthlyIncreaseImageConsumptionNumber))
+		_ = write(42, int(it.MonthlyIncreaseImageConsumptionNumber))
-		_ = write(41, int(it.MonthlyInvalidBundleImageNumber))
+		_ = write(43, int(it.MonthlyInvalidBundleImageNumber))
-		_ = write(42, int(it.MonthlyInvalidIncreaseImageNumber))
+		_ = write(44, int(it.MonthlyInvalidIncreaseImageNumber))
 
 		// 数据分析类
-		_ = write(43, int(it.MonthlyBundleDataAnalysisNumber))
+		_ = write(45, int(it.MonthlyBundleDataAnalysisNumber))
-		_ = write(44, int(it.MonthlyIncreaseDataAnalysisNumber))
+		_ = write(46, int(it.MonthlyIncreaseDataAnalysisNumber))
-		_ = write(45, int(it.BundleDataAnalysisConsumptionNumber))
+		_ = write(47, int(it.BundleDataAnalysisConsumptionNumber))
-		_ = write(46, int(it.IncreaseDataAnalysisConsumptionNumber))
+		_ = write(48, int(it.IncreaseDataAnalysisConsumptionNumber))
-		_ = write(47, int(it.InvalidBundleDataAnalysisNumber))
+		_ = write(49, int(it.InvalidBundleDataAnalysisNumber))
-		_ = write(48, int(it.InvalidIncreaseDataAnalysisNumber))
+		_ = write(50, int(it.InvalidIncreaseDataAnalysisNumber))
-		_ = write(49, int(it.MonthlyNewBundleDataAnalysisNumber))
+		_ = write(51, int(it.MonthlyNewBundleDataAnalysisNumber))
-		_ = write(50, int(it.MonthlyNewIncreaseDataAnalysisNumber))
+		_ = write(52, int(it.MonthlyNewIncreaseDataAnalysisNumber))
-		_ = write(51, int(it.MonthlyBundleDataAnalysisConsumptionNumber))
+		_ = write(53, int(it.MonthlyBundleDataAnalysisConsumptionNumber))
-		_ = write(52, int(it.MonthlyIncreaseDataAnalysisConsumptionNumber))
+		_ = write(54, int(it.MonthlyIncreaseDataAnalysisConsumptionNumber))
-		_ = write(53, int(it.MonthlyInvalidBundleDataAnalysisNumber))
+		_ = write(55, int(it.MonthlyInvalidBundleDataAnalysisNumber))
-		_ = write(54, int(it.MonthlyInvalidIncreaseDataAnalysisNumber))
+		_ = write(56, int(it.MonthlyInvalidIncreaseDataAnalysisNumber))
 
 		// 竞品数
-		_ = write(55, int(it.MonthlyBundleCompetitiveNumber))
+		_ = write(57, int(it.MonthlyBundleCompetitiveNumber))
-		_ = write(56, int(it.MonthlyIncreaseCompetitiveNumber))
+		_ = write(58, int(it.MonthlyIncreaseCompetitiveNumber))
-		_ = write(57, int(it.BundleCompetitiveConsumptionNumber))
+		_ = write(59, int(it.BundleCompetitiveConsumptionNumber))
-		_ = write(58, int(it.IncreaseCompetitiveConsumptionNumber))
+		_ = write(60, int(it.IncreaseCompetitiveConsumptionNumber))
-		_ = write(59, int(it.InvalidBundleCompetitiveNumber))
+		_ = write(61, int(it.InvalidBundleCompetitiveNumber))
-		_ = write(60, int(it.InvalidIncreaseCompetitiveNumber))
+		_ = write(62, int(it.InvalidIncreaseCompetitiveNumber))
-		_ = write(61, int(it.MonthlyNewBundleCompetitiveNumber))
+		_ = write(63, int(it.MonthlyNewBundleCompetitiveNumber))
-		_ = write(62, int(it.MonthlyNewIncreaseCompetitiveNumber))
+		_ = write(64, int(it.MonthlyNewIncreaseCompetitiveNumber))
-		_ = write(63, int(it.MonthlyBundleCompetitiveConsumptionNumber))
+		_ = write(65, int(it.MonthlyBundleCompetitiveConsumptionNumber))
-		_ = write(64, int(it.MonthlyIncreaseCompetitiveConsumptionNumber))
+		_ = write(66, int(it.MonthlyIncreaseCompetitiveConsumptionNumber))
-		_ = write(65, int(it.MonthlyInvalidBundleCompetitiveNumber))
+		_ = write(67, int(it.MonthlyInvalidBundleCompetitiveNumber))
-		_ = write(66, int(it.MonthlyInvalidIncreaseCompetitiveNumber))
+		_ = write(68, int(it.MonthlyInvalidIncreaseCompetitiveNumber))
 
 		// 手动扩展类
-		_ = write(67, int(it.MonthlyNewManualAccountNumber))
+		_ = write(69, int(it.MonthlyNewManualAccountNumber))
-		_ = write(68, int(it.MonthlyNewManualVideoNumber))
+		_ = write(70, int(it.MonthlyNewManualVideoNumber))
-		_ = write(69, int(it.MonthlyNewManualImageNumber))
+		_ = write(71, int(it.MonthlyNewManualImageNumber))
-		_ = write(70, int(it.MonthlyNewManualDataAnalysisNumber))
+		_ = write(72, int(it.MonthlyNewManualDataAnalysisNumber))
-		_ = write(71, int(it.MonthlyNewDurationNumber))
+		_ = write(73, int(it.MonthlyNewDurationNumber))
-		_ = write(72, int(it.MonthlyManualAccountConsumptionNumber))
+		_ = write(74, int(it.MonthlyManualAccountConsumptionNumber))
-		_ = write(73, int(it.MonthlyManualVideoConsumptionNumber))
+		_ = write(75, int(it.MonthlyManualVideoConsumptionNumber))
-		_ = write(74, int(it.MonthlyManualImageConsumptionNumber))
+		_ = write(76, int(it.MonthlyManualImageConsumptionNumber))
-		_ = write(75, int(it.MonthlyManualDataAnalysisConsumptionNumber))
+		_ = write(77, int(it.MonthlyManualDataAnalysisConsumptionNumber))
-		_ = write(76, int(it.MonthlyNewManualCompetitiveNumber))
+		_ = write(78, int(it.MonthlyNewManualCompetitiveNumber))
-		_ = write(77, int(it.MonthlyManualCompetitiveConsumptionNumber))
+		_ = write(79, int(it.MonthlyManualCompetitiveConsumptionNumber))
 
 	}
 
@@ -588,7 +601,7 @@ func GetAccountBundleBalance(c *gin.Context) {
 		service.Error(c, err)
 		return
 	}
-	req.Month = time.Now().Format("2006-01")
+	req.Month = []string{time.Now().Format("2006-01")}
 	res, err := service.BundleProvider.GetBundleBalanceList(context.Background(), &req)
 	if err != nil {
 		service.Error(c, errors.New(common.GetBundleBalanceListFailed))

pkg/service/bundle/bundleMetrics.go

@@ -17,7 +17,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/duke-git/lancet/v2/datetime"
 	"github.com/shopspring/decimal"
 
 	"github.com/gin-gonic/gin"
@@ -257,11 +256,9 @@ func MetricsVideoSubmitExport(ctx *gin.Context) {
 		return
 	}
 	newCtx := serviceCast.NewCtxWithUserInfo(ctx)
-	t, err := time.Parse("2006-01", req.Month)
+	if len(req.Month) > 0 {
-	if err == nil {
 		resp, err = service.CastProvider.WorkList(newCtx, &cast.WorkListReq{
-			SubmitStartTime: datetime.BeginOfMonth(t).Format(time.DateTime),
+			SubmitTimeMonths: req.Month,
-			SubmitEndTime:   datetime.EndOfMonth(t).Format(time.DateTime),
 			Page:             1,
 			PageSize:         99999,
 		})

pkg/service/cast/test.go

@@ -71,10 +71,10 @@ func Test(ctx *gin.Context) {
 	}
 
 	if action == "" {
-		profileKey := ctx.PostForm("profileKey")
+		resp, err := service.CastProvider.WorkList(context.Background(), &cast.WorkListReq{
-		resp, err := service.AyrshareProvider.GetUser(context.Background(), &aryshare.GetUserRequest{
+			Page:             1,
-			ProfileKey:       profileKey,
+			PageSize:         1000,
-			InstagramDetails: true,
+			SubmitTimeMonths: []string{"2026-01", "2025-12"},
 		})
 		if err != nil {
 			service.Error(ctx, err)