internal/controller/bundleMetrics.go

@@ -29,7 +29,3 @@ func (b *BundleProvider) MetricsArtistAccountExport(_ context.Context, req *bund
 func (b *BundleProvider) MetricsVideoSubmitExport(_ context.Context, req *bundle.MetricsVideoSubmitExportReq) (*bundle.MetricsVideoSubmitExportResp, error) {
 	return logic.MetricsVideoSubmitExport(req)
 }
-
-func (b *BundleProvider) ExportWorkCastInfo(_ context.Context, req *bundle.ExportWorkCastInfoReq) (*bundle.ExportWorkCastInfoResp, error) {
-	return logic.ExportWorkCastInfo(req)
-}

internal/dao/bundleExtend.go

@@ -83,7 +83,7 @@ func GetBundleBalanceList(req *bundle.GetBundleBalanceListReq) (data []model.Bun
             WHEN bb.expired_at > NOW() THEN 2
             ELSE 1
         	END AS balance_status`).
-		Joins("LEFT JOIN `micro-account`.real_name rn ON u.real_name_id = rn.id and rn.deleted_at = 0").
+		Joins("LEFT JOIN `micro-account`.real_name rn ON u.real_name_id = rn.id").
 		Joins("LEFT JOIN (?) as bor ON bor.customer_id = u.id", subQuery).
 		Joins("LEFT JOIN bundle_balance bb ON u.id = bb.user_id AND bb.order_uuid = bor.uuid and bb.deleted_at is null").
 		Joins("LEFT JOIN bundle_activate bc on bc.user_id = u.id").

internal/dao/bundleMetrics.go

@@ -67,12 +67,12 @@ func MetricsBusiness(req *bundle.MetricsBusinessReq) (result *bundle.MetricsBusi
 	// ---------- 新增金额统计 ----------
 
 	var NewFeePaymentAmount struct {
-		NewFeePaymentAmount string `gorm:"column:new_fee_payment_amount"`
+		NewFeePaymentAmount float32 `gorm:"column:new_fee_payment_amount"`
-		NewPaymentAmount    string `gorm:"column:new_payment_amount"`
+		NewPaymentAmount    float32 `gorm:"column:new_payment_amount"`
 	}
 
 	subQuery = app.ModuleClients.BundleDB.Model(&model.Reconciliation{}).
-		Select("TRUNCATE(COALESCE(SUM(CAST(handling_fee AS DECIMAL(12,3))), 0), 3) AS new_fee_payment_amount,TRUNCATE(COALESCE(SUM(CAST(pay_amount AS DECIMAL(12,3))), 0), 3) AS new_payment_amount").
+		Select("SUM(handling_fee) as new_fee_payment_amount, SUM(pay_amount) as new_payment_amount").
 		Joins("LEFT JOIN bundle_order_records bor ON bor.order_no COLLATE utf8mb4_general_ci = reconciliation.bundle_order_on COLLATE utf8mb4_general_ci").
 		Where("`reconciliation`.pay_time >= ?", req.Start+" 00:00:00").
 		Where("`reconciliation`.pay_time <= ?", req.End+" 23:59:59").
@@ -103,16 +103,7 @@ func MetricsBusiness(req *bundle.MetricsBusinessReq) (result *bundle.MetricsBusi
 	if err != nil {
 		return
 	}
-	// 使用 decimal 计算新增结算金额，避免精度丢失
+	result.NewFinalPaymentAmount = result.NewPaymentAmount - result.NewFeePaymentAmount
-	newPayDecimal, err := decimal.NewFromString(result.NewPaymentAmount)
-	if err != nil {
-		return nil, fmt.Errorf("解析实收金额失败: %v", err)
-	}
-	newFeeDecimal, err := decimal.NewFromString(result.NewFeePaymentAmount)
-	if err != nil {
-		return nil, fmt.Errorf("解析手续费失败: %v", err)
-	}
-	result.NewFinalPaymentAmount = newPayDecimal.Sub(newFeeDecimal).Truncate(3).StringFixed(2)
 
 	// ---------- 新套餐数统计 ----------
 	var newBundleCount int64
@@ -249,7 +240,6 @@ func MetricsBusiness(req *bundle.MetricsBusinessReq) (result *bundle.MetricsBusi
 		Joins("LEFT JOIN cast_work_log AS cwl ON cwl.work_uuid = cw.uuid and cwl.work_status = 9").
 		Where("cwl.work_status = 9").
 		Where("cwe.cost_type in ?", []int{1, 2}).
-		Where("cw.work_category = ?", 2).
 		Where("cw.status in ?", []int{7, 6, 9}).
 		Where("cwl.update_time >= ?", req.Start+" 00:00:00").
 		Where("cwl.update_time <= ?", req.End+" 23:59:59").
@@ -353,7 +343,6 @@ func MetricsBusiness(req *bundle.MetricsBusinessReq) (result *bundle.MetricsBusi
 		Where("cast_work.submit_time <= ?", req.End+" 23:59:59").
 		Where("cast_work.work_category = 2"). // 视频类型
 		Where("cwe.cost_type = 1").           // 套餐类型
-		Where("cast_work.status != 8").
 		Where("cast_work.origin_uuid = ''").
 		Where("cast_work.deleted_at = 0")
 	if req.BundleUuid != "" {
@@ -371,7 +360,6 @@ func MetricsBusiness(req *bundle.MetricsBusinessReq) (result *bundle.MetricsBusi
 		Where("cast_work.submit_time <= ?", req.End+" 23:59:59").
 		Where("cast_work.work_category = 2").     // 视频类型
 		Where("cwe.cost_type in ?", []int{2, 3}). // 增值类型
-		Where("cast_work.status != 8").
 		Where("cast_work.origin_uuid = ''").
 		Where("cast_work.deleted_at = 0")
 	if req.BundleUuid != "" {
@@ -492,7 +480,6 @@ func MetricsBusiness(req *bundle.MetricsBusinessReq) (result *bundle.MetricsBusi
 		Where("cast_work.submit_time <= ?", req.End+" 23:59:59").
 		Where("cast_work.work_category = 1"). // 图文类型
 		Where("cwe.cost_type = 1 ").          // 套餐类型
-		Where("cast_work.status != 8").
 		Where("cast_work.origin_uuid = ''").
 		Where("cast_work.deleted_at = 0")
 	if req.BundleUuid != "" {
@@ -510,7 +497,6 @@ func MetricsBusiness(req *bundle.MetricsBusinessReq) (result *bundle.MetricsBusi
 		Where("cast_work.submit_time <= ?", req.End+" 23:59:59").
 		Where("cast_work.work_category = 1").     // 图文类型
 		Where("cwe.cost_type in ?", []int{2, 3}). // 增值类型
-		Where("cast_work.status != 8").
 		Where("cast_work.origin_uuid = ''").
 		Where("cast_work.deleted_at = 0")
 	if req.BundleUuid != "" {
@@ -777,7 +763,6 @@ func MetricsOperatingCreate(req *bundle.MetricsOperatingCreateReq) (result *bund
 		Where("cast_work.submit_time <= ?", req.End+" 23:59:59").
 		Where("work_category = 2"). // 视频类型
 		Where("cwe.cost_type = 1"). // 套餐类型
-		Where("cast_work.status != 8").
 		Where("cast_work.origin_uuid = ''").
 		Where("cast_work.deleted_at = 0 and cwe.deleted_at = 0").
 		Count(&totalUploadedBundleVideoCount)
@@ -788,7 +773,6 @@ func MetricsOperatingCreate(req *bundle.MetricsOperatingCreateReq) (result *bund
 		Where("cast_work.submit_time <= ?", req.End+" 23:59:59").
 		Where("work_category = 2").               // 视频类型
 		Where("cwe.cost_type in ?", []int{2, 3}). // 增值类型或扩展类型
-		Where("cast_work.status != 8").
 		Where("cast_work.origin_uuid = ''").
 		Where("cast_work.deleted_at = 0 and cwe.deleted_at = 0").
 		Count(&totalUploadedIncreaseVideoCount)
@@ -838,7 +822,6 @@ func MetricsOperatingCreate(req *bundle.MetricsOperatingCreateReq) (result *bund
 		Where("cast_work.submit_time <= ?", req.End+" 23:59:59").
 		Where("work_category = 1"). // 图文类型
 		Where("cast_work.origin_uuid = ''").
-		Where("cast_work.status != 8").
 		// Where("cwe.cost_type = 2"). // 套餐类型
 		Where("deleted_at = 0").
 		Count(&totalUploadedImageCount)
@@ -850,7 +833,6 @@ func MetricsOperatingCreate(req *bundle.MetricsOperatingCreateReq) (result *bund
 		Where("cast_work.submit_time <= ?", req.End+" 23:59:59").
 		Where("work_category = 1"). // 图文类型
 		Where("cwe.cost_type = 1"). // 套餐类型
-		Where("cast_work.status != 8").
 		Where("cast_work.origin_uuid = ''").
 		Where("cast_work.deleted_at = 0 and cwe.deleted_at = 0").
 		Count(&totalUploadedBundleImageCount)
@@ -1760,47 +1742,3 @@ func qua(data model.BundleBalance, total, limit int, date time.Time) int {
 	}
 	return 0
 }
-
-func ExportWorkCastInfo(req *bundle.ExportWorkCastInfoReq) (*bundle.ExportWorkCastInfoResp, error) {
-	result := &bundle.ExportWorkCastInfoResp{}
-	query := app.ModuleClients.BundleDB.Raw(`
-			SELECT 
-			bor.customer_name,
-			bor.customer_num,
-			bor.bundle_name,
-			bor.signed_time,
-			cw.title,
-			cwe.cost_type,
-			cw.work_category,
-			cw.submit_time,
-			cwl_wating.update_time AS waiting_time,
-			cwl_confirm.update_time AS confirm_time
-		FROM bundle_balance bb
-		LEFT JOIN bundle_order_records bor 
-			ON bor.uuid = bb.order_uuid AND bor.deleted_at IS NULL
-		LEFT JOIN cast_work cw 
-			ON cw.artist_uuid = bb.user_id AND cw.deleted_at = 0
-		LEFT JOIN cast_work_extra cwe 
-			ON cwe.work_uuid = cw.uuid AND cwe.deleted_at = 0
-		LEFT JOIN cast_work_log cwl_confirm 
-			ON cwl_confirm.work_uuid = cw.uuid 
-			AND cwl_confirm.work_status = 9 
-			AND cwl_confirm.deleted_at = 0
-		LEFT JOIN cast_work_log cwl_wating 
-			ON cwl_wating.work_uuid = cw.uuid 
-			AND cwl_wating.work_status = 4 
-			AND cwl_wating.deleted_at = 0
-		WHERE bb.deleted_at IS NULL
-		AND bb.month = '2026-01'
-		AND bor.deleted_at IS NULL
-		AND cw.title IS NOT NULL
-		AND cw.submit_time < ?
-		AND cw.submit_time > ?
-		ORDER BY cw.uuid;
-	`, req.EndTime, req.StartTime)
-	err := query.Scan(&result.Data).Error
-	if err != nil {
-		return nil, err
-	}
-	return result, err
-}

internal/logic/bundleMetricsLogic.go

@@ -26,7 +26,3 @@ func MetricsArtistAccountExport(req *bundle.MetricsArtistAccountExportReq) (*bun
 func MetricsVideoSubmitExport(req *bundle.MetricsVideoSubmitExportReq) (*bundle.MetricsVideoSubmitExportResp, error) {
 	return dao.MetricsVideoSubmitExport(req)
 }
-
-func ExportWorkCastInfo(req *bundle.ExportWorkCastInfoReq) (*bundle.ExportWorkCastInfoResp, error) {
-	return dao.ExportWorkCastInfo(req)
-}

pb/bundle.proto

@@ -112,9 +112,6 @@ service Bundle {
   rpc MetricsArtistAccountExport(MetricsArtistAccountExportReq) returns (MetricsArtistAccountExportResp) {}
   rpc MetricsVideoSubmitExport(MetricsVideoSubmitExportReq) returns (MetricsVideoSubmitExportResp) {}
   rpc QueryTheOrderSnapshotInformation(QueryTheOrderSnapshotInformationReq) returns (QueryTheOrderSnapshotInformationResp) {}
-
-  //临时接口
-  rpc ExportWorkCastInfo(ExportWorkCastInfoReq) returns (ExportWorkCastInfoResp) {}
 }
 message QueryTheOrderSnapshotInformationReq{
   string orderNo = 1;
@@ -1664,11 +1661,11 @@ message MetricsBusinessResp {
   string finalPaymentAmount = 4;           // 合计结算金额
   string totalFeePaymentAmount = 5;        // 合计手续费
 
-  string newBundlePaymentAmount = 6;       // 新增套餐购买金额
+  float newBundlePaymentAmount = 6;       // 新增套餐购买金额
-  string newIncreasePaymentAmount = 7;     // 新增增值服务金额
+  float newIncreasePaymentAmount = 7;     // 新增增值服务金额
-  string newPaymentAmount = 8;             // 新增支付金额
+  float newPaymentAmount = 8;             // 新增支付金额
-  string newFinalPaymentAmount = 9;        // 新增结算金额
+  float newFinalPaymentAmount = 9;        // 新增结算金额
-  string newFeePaymentAmount = 10;         // 新增手续费
+  float newFeePaymentAmount = 10;         // 新增手续费
 
   // ====== 套餐统计 ======
   int64 newBundleCount = 11;              // 新购买套餐数
@@ -1890,25 +1887,3 @@ message MetricsVideoSubmitExportItem {
 message MetricsBalanceDetailExportReq{
   string month = 1;
 }
-
-message WorkCastInfo{
-  string customerName = 1;
-  string customerNum = 2;
-  string bundleName = 3;
-  string signedTime = 4;
-  string title = 5;
-  int64 costType = 6;
-  int64 workCategory = 7;
-  string submitTime = 8;
-  string waitingTime = 9;
-  string confirmTime = 10;
-}
-
-message ExportWorkCastInfoReq{
-  string startTime = 1;
-  string endTime = 2;
-}
-
-message ExportWorkCastInfoResp{
-  repeated WorkCastInfo data = 1;
-}

pb/bundle/bundle.validator.pb.go

@@ -812,19 +812,3 @@ func (this *MetricsVideoSubmitExportItem) Validate() error {
 func (this *MetricsBalanceDetailExportReq) Validate() error {
 	return nil
 }
-func (this *WorkCastInfo) Validate() error {
-	return nil
-}
-func (this *ExportWorkCastInfoReq) Validate() error {
-	return nil
-}
-func (this *ExportWorkCastInfoResp) Validate() error {
-	for _, item := range this.Data {
-		if item != nil {
-			if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
-				return github_com_mwitkow_go_proto_validators.FieldError("Data", err)
-			}
-		}
-	}
-	return nil
-}

pb/bundle/bundle_triple.pb.go

@@ -119,8 +119,6 @@ type BundleClient interface {
 	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)
 	QueryTheOrderSnapshotInformation(ctx context.Context, in *QueryTheOrderSnapshotInformationReq, opts ...grpc_go.CallOption) (*QueryTheOrderSnapshotInformationResp, common.ErrorWithAttachment)
-	// 临时接口
-	ExportWorkCastInfo(ctx context.Context, in *ExportWorkCastInfoReq, opts ...grpc_go.CallOption) (*ExportWorkCastInfoResp, common.ErrorWithAttachment)
 }
 
 type bundleClient struct {
@@ -211,7 +209,6 @@ type BundleClientImpl struct {
 	MetricsArtistAccountExport               func(ctx context.Context, in *MetricsArtistAccountExportReq) (*MetricsArtistAccountExportResp, error)
 	MetricsVideoSubmitExport                 func(ctx context.Context, in *MetricsVideoSubmitExportReq) (*MetricsVideoSubmitExportResp, error)
 	QueryTheOrderSnapshotInformation         func(ctx context.Context, in *QueryTheOrderSnapshotInformationReq) (*QueryTheOrderSnapshotInformationResp, error)
-	ExportWorkCastInfo                       func(ctx context.Context, in *ExportWorkCastInfoReq) (*ExportWorkCastInfoResp, error)
 }
 
 func (c *BundleClientImpl) GetDubboStub(cc *triple.TripleConn) BundleClient {
@@ -724,12 +721,6 @@ func (c *bundleClient) QueryTheOrderSnapshotInformation(ctx context.Context, in
 	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/QueryTheOrderSnapshotInformation", in, out)
 }
 
-func (c *bundleClient) ExportWorkCastInfo(ctx context.Context, in *ExportWorkCastInfoReq, opts ...grpc_go.CallOption) (*ExportWorkCastInfoResp, common.ErrorWithAttachment) {
-	out := new(ExportWorkCastInfoResp)
-	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
-	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/ExportWorkCastInfo", in, out)
-}
-
 // BundleServer is the server API for Bundle service.
 // All implementations must embed UnimplementedBundleServer
 // for forward compatibility
@@ -825,8 +816,6 @@ type BundleServer interface {
 	MetricsArtistAccountExport(context.Context, *MetricsArtistAccountExportReq) (*MetricsArtistAccountExportResp, error)
 	MetricsVideoSubmitExport(context.Context, *MetricsVideoSubmitExportReq) (*MetricsVideoSubmitExportResp, error)
 	QueryTheOrderSnapshotInformation(context.Context, *QueryTheOrderSnapshotInformationReq) (*QueryTheOrderSnapshotInformationResp, error)
-	// 临时接口
-	ExportWorkCastInfo(context.Context, *ExportWorkCastInfoReq) (*ExportWorkCastInfoResp, error)
 	mustEmbedUnimplementedBundleServer()
 }
 
@@ -1084,9 +1073,6 @@ func (UnimplementedBundleServer) MetricsVideoSubmitExport(context.Context, *Metr
 func (UnimplementedBundleServer) QueryTheOrderSnapshotInformation(context.Context, *QueryTheOrderSnapshotInformationReq) (*QueryTheOrderSnapshotInformationResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method QueryTheOrderSnapshotInformation not implemented")
 }
-func (UnimplementedBundleServer) ExportWorkCastInfo(context.Context, *ExportWorkCastInfoReq) (*ExportWorkCastInfoResp, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method ExportWorkCastInfo not implemented")
-}
 func (s *UnimplementedBundleServer) XXX_SetProxyImpl(impl protocol.Invoker) {
 	s.proxyImpl = impl
 }
@@ -3522,35 +3508,6 @@ func _Bundle_QueryTheOrderSnapshotInformation_Handler(srv interface{}, ctx conte
 	return interceptor(ctx, in, info, handler)
 }
 
-func _Bundle_ExportWorkCastInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
-	in := new(ExportWorkCastInfoReq)
-	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("ExportWorkCastInfo", 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)
-}
-
 // Bundle_ServiceDesc is the grpc_go.ServiceDesc for Bundle service.
 // It's only intended for direct use with grpc_go.RegisterService,
 // and not to be introspected or modified (even as a copy)
@@ -3890,10 +3847,6 @@ var Bundle_ServiceDesc = grpc_go.ServiceDesc{
 			MethodName: "QueryTheOrderSnapshotInformation",
 			Handler:    _Bundle_QueryTheOrderSnapshotInformation_Handler,
 		},
-		{
-			MethodName: "ExportWorkCastInfo",
-			Handler:    _Bundle_ExportWorkCastInfo_Handler,
-		},
 	},
 	Streams:  []grpc_go.StreamDesc{},
 	Metadata: "pb/bundle.proto",