diff --git a/internal/dao/bundleMetrics.go b/internal/dao/bundleMetrics.go index 4715068..e2be31c 100644 --- a/internal/dao/bundleMetrics.go +++ b/internal/dao/bundleMetrics.go @@ -334,13 +334,13 @@ func MetricsBusiness(req *bundle.MetricsBusinessReq) (result *bundle.MetricsBusi newVideoUsed = videoCountInfo.VideoUsed + videoCountInfo.UnUsedVideo } else { query = app.ModuleClients.BundleDB.Model(&model.CastWork{}). - Joins("left join bundle_balance bb ON CAST(bb.user_id AS CHAR) COLLATE utf8mb4_general_ci = cast_work.artist_uuid COLLATE utf8mb4_general_ci AND cast_work.submit_time >= bb.start_at AND cast_work.submit_time <= bb.expired_at and bb.month = DATE_FORMAT(cast_work.submit_time, '%Y-%m')"). - Joins("left join bundle_order_records bor ON bor.uuid = bb.order_uuid"). + Joins("LEFT JOIN cast_work_extra cwe ON cwe.work_uuid = cast_work.uuid"). + Joins("left join bundle_order_records bor ON bor.uuid = cwe.bundle_order_uuid"). Where("cast_work.work_category = 2"). Where("cast_work.submit_time >= ?", req.Start+" 00:00:00"). Where("cast_work.submit_time <= ?", req.End+" 23:59:59"). Where("cast_work.origin_uuid = ''"). - Where("cast_work.deleted_at = 0 and bor.deleted_at IS NULL and bb.deleted_at IS NULL"). + Where("cast_work.deleted_at = 0 and bor.deleted_at IS NULL and cwe.deleted_at = 0"). Where("bor.bundle_uuid = ?", req.BundleUuid) err = query.Count(&newVideoUsed).Error if err != nil { @@ -473,13 +473,13 @@ func MetricsBusiness(req *bundle.MetricsBusinessReq) (result *bundle.MetricsBusi newImageUsed = imageCountInfo.ImageUsed + imageCountInfo.UnUsedImage } else { query = app.ModuleClients.BundleDB.Model(&model.CastWork{}). - Joins("left join bundle_balance bb ON CAST(bb.user_id AS CHAR) COLLATE utf8mb4_general_ci = cast_work.artist_uuid COLLATE utf8mb4_general_ci AND cast_work.submit_time >= bb.start_at AND cast_work.submit_time <= bb.expired_at and bb.month = DATE_FORMAT(cast_work.submit_time, '%Y-%m')"). - Joins("left join bundle_order_records bor ON bor.uuid = bb.order_uuid"). + Joins("LEFT JOIN cast_work_extra cwe ON cwe.work_uuid = cast_work.uuid"). + Joins("left join bundle_order_records bor ON bor.uuid = cwe.bundle_order_uuid"). Where("cast_work.work_category = 1"). Where("cast_work.submit_time >= ?", req.Start+" 00:00:00"). Where("cast_work.submit_time <= ?", req.End+" 23:59:59"). Where("cast_work.origin_uuid = ''"). - Where("cast_work.deleted_at = 0 and bor.deleted_at IS NULL and bb.deleted_at IS NULL"). + Where("cast_work.deleted_at = 0 and bor.deleted_at IS NULL and cwe.deleted_at = 0"). Where("bor.bundle_uuid = ?", req.BundleUuid) err = query.Count(&newImageUsed).Error if err != nil { @@ -551,11 +551,11 @@ func MetricsBusiness(req *bundle.MetricsBusinessReq) (result *bundle.MetricsBusi newDataAnalysisUsed = dataAnalysisCountInfo.DataAnalysisUsed + dataAnalysisCountInfo.UnUsedDataAnalysis } else { query = app.ModuleClients.BundleDB.Table("cast_work_analysis as cwa"). - Joins("left join bundle_balance bb ON CAST(bb.user_id AS CHAR) COLLATE utf8mb4_general_ci = cwa.artist_id COLLATE utf8mb4_general_ci AND cwa.submit_time >= bb.start_at AND cwa.submit_time <= bb.expired_at and bb.month = DATE_FORMAT(cwa.submit_time, '%Y-%m')"). - Joins("left join bundle_order_records bor ON bor.uuid = bb.order_uuid"). + Joins("LEFT JOIN cast_work_analysis_extra cwae ON cwae.analysis_uuid = cwa.uuid"). + Joins("left join bundle_order_records bor ON bor.uuid = cwae.bundle_order_uuid"). Where("cwa.submit_time >= ?", req.Start+" 00:00:00"). Where("cwa.submit_time <= ?", req.End+" 23:59:59"). - Where("cwa.deleted_at = 0 and bor.deleted_at IS NULL and bb.deleted_at IS NULL"). + Where("cwa.deleted_at = 0 and bor.deleted_at IS NULL and cwae.deleted_at = 0"). Where("bor.bundle_uuid = ?", req.BundleUuid) err = query.Count(&newDataAnalysisUsed).Error if err != nil { @@ -621,11 +621,11 @@ func MetricsBusiness(req *bundle.MetricsBusinessReq) (result *bundle.MetricsBusi newConpetitiveUsed = conpetitiveCountInfo.ConpetitiveUsed + conpetitiveCountInfo.UnUsedConpetitive } else { query = app.ModuleClients.BundleDB.Table("cast_competitive_report as ccr"). - Joins("left join bundle_balance bb ON CAST(bb.user_id AS CHAR) COLLATE utf8mb4_general_ci = ccr.artist_id COLLATE utf8mb4_general_ci AND ccr.submit_time >= bb.start_at AND ccr.submit_time <= bb.expired_at and bb.month = DATE_FORMAT(ccr.submit_time, '%Y-%m')"). - Joins("left join bundle_order_records bor ON bor.uuid = bb.order_uuid"). + Joins("LEFT JOIN cast_competitive_report_extra ccrpe ON ccrpe.report_uuid = ccr.uuid"). + Joins("left join bundle_order_records bor ON bor.uuid = ccrpe.bundle_order_uuid"). Where("ccr.submit_time >= ?", req.Start+" 00:00:00"). Where("ccr.submit_time <= ?", req.End+" 23:59:59"). - Where("ccr.deleted_at = 0 and bor.deleted_at IS NULL and bb.deleted_at IS NULL"). + Where("ccr.deleted_at = 0 and bor.deleted_at IS NULL and ccrpe.deleted_at = 0"). Where("bor.bundle_uuid = ?", req.BundleUuid) err = query.Count(&newConpetitiveUsed).Error if err != nil {