fiee/micro-bundle
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updata：增加重发数据过滤

Browse Source
This commit is contained in:
jiaji.H 2025-12-16 09:29:15 +08:00
parent 28f5055895
commit 6b61b43464
2 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
internal/dao/bundleMetrics.go
View File

@ -190,6 +190,7 @@ func MetricsBusiness(req *bundle.MetricsBusinessReq) (result *bundle.MetricsBusi
Where("cwe.cost_type = 1").
Where("cwl.update_time >= ?", req.Start+" 00:00:00").
Where("cwl.update_time <= ?", req.End+" 23:59:59").
Where("cast_work.origin_uuid = ''").
Where("cast_work.deleted_at = 0 and ccl.deleted_at = 0 and cwe.deleted_at = 0")
if req.BundleUuid != "" {
query = query.Where("ccl.bundle_uuid = ?", req.BundleUuid)
@ -208,6 +209,7 @@ func MetricsBusiness(req *bundle.MetricsBusinessReq) (result *bundle.MetricsBusi
Where("cwe.cost_type != 1").
Where("cwl.update_time >= ?", req.Start+" 00:00:00").
Where("cwl.update_time <= ?", req.End+" 23:59:59").
Where("cast_work.origin_uuid = ''").
Where("cast_work.deleted_at = 0 and ccl.deleted_at = 0 and cwe.deleted_at = 0")
if req.BundleUuid != "" {
query = query.Where("ccl.bundle_uuid = ?", req.BundleUuid)
@ -239,6 +241,7 @@ func MetricsBusiness(req *bundle.MetricsBusinessReq) (result *bundle.MetricsBusi
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").
Where("cw.origin_uuid = ''").
Where("cw.deleted_at = 0 and cwl.deleted_at = 0 and cwe.deleted_at = 0").
Group("cw.artist_uuid")
@ -301,6 +304,7 @@ func MetricsBusiness(req *bundle.MetricsBusinessReq) (result *bundle.MetricsBusi
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")
if req.BundleUuid != "" {
@ -321,6 +325,7 @@ func MetricsBusiness(req *bundle.MetricsBusinessReq) (result *bundle.MetricsBusi
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("bor.bundle_uuid = ?", req.BundleUuid)
err = query.Count(&newVideoUsed).Error
@ -336,6 +341,7 @@ 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.origin_uuid = ''").
Where("cast_work.deleted_at = 0")
if req.BundleUuid != "" {
queryBundleVideo = queryBundleVideo.Where("ccl.bundle_uuid = ?", req.BundleUuid)
@ -352,6 +358,7 @@ 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.origin_uuid = ''").
Where("cast_work.deleted_at = 0")
if req.BundleUuid != "" {
queryIncreaseVideo = queryIncreaseVideo.Where("ccl.bundle_uuid = ?", req.BundleUuid)
@ -435,6 +442,7 @@ func MetricsBusiness(req *bundle.MetricsBusinessReq) (result *bundle.MetricsBusi
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")
if req.BundleUuid != "" {
@ -454,6 +462,7 @@ func MetricsBusiness(req *bundle.MetricsBusinessReq) (result *bundle.MetricsBusi
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("bor.bundle_uuid = ?", req.BundleUuid)
err = query.Count(&newImageUsed).Error
@ -469,6 +478,7 @@ 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.origin_uuid = ''").
Where("cast_work.deleted_at = 0")
if req.BundleUuid != "" {
queryBundleImage = queryBundleImage.Where("ccl.bundle_uuid = ?", req.BundleUuid)
@ -485,6 +495,7 @@ 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.origin_uuid = ''").
Where("cast_work.deleted_at = 0")
if req.BundleUuid != "" {
queryIncreaseImage = queryIncreaseImage.Where("ccl.bundle_uuid = ?", req.BundleUuid)
@ -510,6 +521,7 @@ func MetricsBusiness(req *bundle.MetricsBusinessReq) (result *bundle.MetricsBusi
Where("cast_work.work_category = 3").
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")
if req.BundleUuid != "" {
query = query.Where("ccl.bundle_uuid = ?", req.BundleUuid)
@ -528,6 +540,7 @@ func MetricsBusiness(req *bundle.MetricsBusinessReq) (result *bundle.MetricsBusi
Where("cast_work.work_category = 3").
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("bor.bundle_uuid = ?", req.BundleUuid)
err = query.Count(&newDataAnalysisUsed).Error
@ -543,6 +556,7 @@ func MetricsBusiness(req *bundle.MetricsBusinessReq) (result *bundle.MetricsBusi
Where("cast_work.submit_time <= ?", req.End+" 23:59:59").
Where("cast_work.work_category = 3"). // 数据分析类型
Where("cwe.cost_type = 1"). // 套餐类型
Where("cast_work.origin_uuid = ''").
Where("cast_work.deleted_at = 0")
if req.BundleUuid != "" {
queryBundleDataAnalysis = queryBundleDataAnalysis.Where("ccl.bundle_uuid = ?", req.BundleUuid)
@ -559,6 +573,7 @@ func MetricsBusiness(req *bundle.MetricsBusinessReq) (result *bundle.MetricsBusi
Where("cast_work.submit_time <= ?", req.End+" 23:59:59").
Where("cast_work.work_category = 3"). // 数据分析类型
Where("cwe.cost_type in ?", []int{2, 3}). // 增值类型
Where("cast_work.origin_uuid = ''").
Where("cast_work.deleted_at = 0")
if req.BundleUuid != "" {
queryIncreaseDataAnalysis = queryIncreaseDataAnalysis.Where("ccl.bundle_uuid = ?", req.BundleUuid)
@ -644,6 +659,7 @@ func MetricsOperatingCreate(req *bundle.MetricsOperatingCreateReq) (result *bund
Where("cast_work.submit_time >= ?", req.Start+" 00:00:00").
Where("cast_work.submit_time <= ?", req.End+" 23:59:59").
Where("work_category = 2"). // 视频类型
Where("cast_work.origin_uuid = ''").
// Where("cwe.cost_type = 1"). // 套餐类型
Where("deleted_at = 0").
Count(&newUploadedBundleVideoCount)
@ -664,6 +680,7 @@ func MetricsOperatingCreate(req *bundle.MetricsOperatingCreateReq) (result *bund
// Joins("left join cast_work_extra cwe on cwe.work_uuid = cast_work.uuid").
Where("cast_work.submit_time <= ?", req.End+" 23:59:59").
Where("work_category = 2"). // 视频类型
Where("cast_work.origin_uuid = ''").
// Where("cwe.cost_type = 1"). // 套餐类型
Where("deleted_at = 0").
Count(&totalUploadedVideoCount)
@ -675,6 +692,7 @@ 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.origin_uuid = ''").
Where("cast_work.deleted_at = 0 and cwe.deleted_at = 0").
Count(&totalUploadedBundleVideoCount)
@ -684,6 +702,7 @@ 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.origin_uuid = ''").
Where("cast_work.deleted_at = 0 and cwe.deleted_at = 0").
Count(&totalUploadedIncreaseVideoCount)
@ -710,6 +729,7 @@ func MetricsOperatingCreate(req *bundle.MetricsOperatingCreateReq) (result *bund
Where("cast_work.submit_time >= ?", req.Start+" 00:00:00").
Where("cast_work.submit_time <= ?", req.End+" 23:59:59").
Where("work_category = 1"). // 图文类型
Where("cast_work.origin_uuid = ''").
// Where("cwe.cost_type = 1"). // 套餐类型
Where("deleted_at = 0").
Count(&newUploadedBundleImageCount)
@ -730,6 +750,7 @@ func MetricsOperatingCreate(req *bundle.MetricsOperatingCreateReq) (result *bund
// Joins("left join cast_work_extra cwe on cwe.work_uuid = cast_work.uuid").
Where("cast_work.submit_time <= ?", req.End+" 23:59:59").
Where("work_category = 1"). // 图文类型
Where("cast_work.origin_uuid = ''").
// Where("cwe.cost_type = 2"). // 套餐类型
Where("deleted_at = 0").
Count(&totalUploadedImageCount)
@ -741,6 +762,7 @@ 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.origin_uuid = ''").
Where("cast_work.deleted_at = 0 and cwe.deleted_at = 0").
Count(&totalUploadedBundleImageCount)
@ -750,6 +772,7 @@ 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 in ?", []int{2, 3}). // 增值类型
Where("cast_work.origin_uuid = ''").
Where("cast_work.deleted_at = 0 and cwe.deleted_at = 0").
Count(&totalUploadedIncreaseImageCount)
@ -759,6 +782,7 @@ func MetricsOperatingCreate(req *bundle.MetricsOperatingCreateReq) (result *bund
Where("cast_work.submit_time >= ?", req.Start+" 00:00:00").
Where("cast_work.submit_time <= ?", req.End+" 23:59:59").
Where("work_category = 3"). // 数据分析类型
Where("cast_work.origin_uuid = ''").
Where("deleted_at = 0").
Count(&newUploadedBundleDataAnalysisCount)
result.NewUploadedBundleDataAnalysisCount = newUploadedBundleDataAnalysisCount
@ -767,6 +791,7 @@ func MetricsOperatingCreate(req *bundle.MetricsOperatingCreateReq) (result *bund
app.ModuleClients.BundleDB.Model(&model.CastWork{}).
Where("cast_work.submit_time <= ?", req.End+" 23:59:59").
Where("work_category = 3"). // 数据分析类型
Where("cast_work.origin_uuid = ''").
Where("deleted_at = 0").
Count(&totalUploadedDataAnalysisCount)
result.TotalUploadedBundleDataAnalysisCount = totalUploadedDataAnalysisCount
@ -777,6 +802,7 @@ func MetricsOperatingCreate(req *bundle.MetricsOperatingCreateReq) (result *bund
Where("cast_work.submit_time <= ?", req.End+" 23:59:59").
Where("work_category = 3"). // 数据分析类型
Where("cwe.cost_type = 1"). // 套餐类型
Where("cast_work.origin_uuid = ''").
Where("cast_work.deleted_at = 0 and cwe.deleted_at = 0").
Count(&totalUploadedBundleDataAnalysisCount)
@ -786,6 +812,7 @@ func MetricsOperatingCreate(req *bundle.MetricsOperatingCreateReq) (result *bund
Where("cast_work.submit_time <= ?", req.End+" 23:59:59").
Where("work_category = 3"). // 数据分析类型
Where("cwe.cost_type in ?", []int{2, 3}). // 增值类型
Where("cast_work.origin_uuid = ''").
Where("cast_work.deleted_at = 0 and cwe.deleted_at = 0").
Count(&totalUploadedIncreaseDataAnalysisCount)
@ -1315,7 +1342,7 @@ func MetricsVideoSubmitExport(req *bundle.MetricsVideoSubmitExportReq) (result *
Joins("left join (select created_at,work_uuid from cast_work_platform_info cwi where cwi.platform_id = 4) dm on dm.work_uuid = cw.uuid").
Joins("left join (select created_at,work_uuid from cast_work_platform_info cwi where cwi.platform_id = 3) ins on ins.work_uuid = cw.uuid").
Joins("left join bundle_order_records bor on bor.customer_id COLLATE utf8mb4_general_ci = cw.artist_uuid COLLATE utf8mb4_general_ci").
Where("(tiktok.created_at is not null or dm.created_at is not null or ins.created_at is not null) and cw.deleted_at = 0 and bor.deleted_at is null").
Where("(tiktok.created_at is not null or dm.created_at is not null or ins.created_at is not null) and cw.deleted_at = 0 and bor.deleted_at is null and cw.origin_uuid = ''").
Order("cw.artist_name")
} else {
@ -1331,7 +1358,7 @@ func MetricsVideoSubmitExport(req *bundle.MetricsVideoSubmitExportReq) (result *
Joins(`LEFT JOIN cast_work_platform_info dm ON dm.work_uuid = cw.uuid AND dm.platform_id = 4 AND dm.created_at >= ? AND dm.created_at <= ?`, start.Unix(), end.Unix()).
Joins(`LEFT JOIN cast_work_platform_info ins ON ins.work_uuid = cw.uuid AND ins.platform_id = 3 AND ins.created_at >= ? AND ins.created_at <= ?`, start.Unix(), end.Unix()).
Joins(`LEFT JOIN bundle_order_records bor ON bor.customer_id COLLATE utf8mb4_general_ci = cw.artist_uuid COLLATE utf8mb4_general_ci AND bor.deleted_at IS NULL`).
Where(`cw.deleted_at = 0 AND (tiktok.created_at IS NOT NULL OR dm.created_at IS NOT NULL OR ins.created_at IS NOT NULL)`).
Where(`cw.origin_uuid = '' and cw.deleted_at = 0 AND (tiktok.created_at IS NOT NULL OR dm.created_at IS NOT NULL OR ins.created_at IS NOT NULL)`).
Order("cw.artist_name")
}

4
pb/bundle.proto
View File

@ -70,8 +70,8 @@ service Bundle {
rpc GetImageWorkDetail(GetImageWorkDetailReq) returns (GetImageWorkDetailResp) {} // 获取图文作品详情
rpc GetVedioWorkDetail(GetVedioWorkDetailReq) returns (GetVedioeWorkDetailResp) {} // 获取数据分析作品详情
rpc ToBeComfirmedWorks(ToBeComfirmedWorksReq) returns (ToBeComfirmedWorksResp) {} // 待确认作品列表
rpc ConfirmWork(ConfirmWorkReq) returns (ConfirmWorkResp) {} // 确认作品
rpc ToBeComfirmedWorks(ToBeComfirmedWorksReq) returns (ToBeComfirmedWorksResp) {} // 待确认作品列表（现已不用,该功能接口调整至CastWork中数据分析proto中）
rpc ConfirmWork(ConfirmWorkReq) returns (ConfirmWorkResp) {} // 确认作品（视频、图文确认）
//对账单
rpc GetReconciliationList(GetReconciliationListReq) returns (GetReconciliationListResp) {} // 获取对账单列表