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

Merge remote-tracking branch 'origin/dev-lzh-1029' into feat-hjj-CastWork

Browse Source
This commit is contained in:
jiaji.H 2025-11-10 16:10:58 +08:00
commit b8c077252b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/dao/bundleMetrics.go
View File

@ -156,6 +156,8 @@ func MetricsBusiness(req *bundle.MetricsBusinessReq) (result *bundle.MetricsBusi
Joins("left join cast_cost_log ccl on ccl.work_uuid = cast_work.uuid").
Where("cast_work.status = 9").
Where("cwe.cost_type = 1").
Where("cast_work.submit_time >= ?", req.Start+" 00:00:00").
Where("cast_work.submit_time <= ?", req.End+" 23:59:59").
Where("cast_work.deleted_at = 0")
if req.BundleUuid != "" {
query = query.Where("ccl.bundle_uuid = ?", req.BundleUuid)
@ -172,6 +174,8 @@ func MetricsBusiness(req *bundle.MetricsBusinessReq) (result *bundle.MetricsBusi
Joins("left join cast_cost_log ccl on ccl.work_uuid = cast_work.uuid").
Where("cast_work.status = 9").
Where("cwe.cost_type != 1").
Where("cast_work.submit_time >= ?", req.Start+" 00:00:00").
Where("cast_work.submit_time <= ?", req.End+" 23:59:59").
Where("cast_work.deleted_at = 0")
if req.BundleUuid != "" {
query = query.Where("ccl.bundle_uuid = ?", req.BundleUuid)
@ -242,7 +246,7 @@ func MetricsBusiness(req *bundle.MetricsBusinessReq) (result *bundle.MetricsBusi
Group("b_inner.user_id") // 相应地更新 Group By
statisticSubQuery = app.ModuleClients.BundleDB.Table("bundle_balance as bb").
Select("(bor.amount / nullif(((bb.increase_video_number + bb.increase_limit_video_number + bb.increase_limit_video_expired_number))), 0)) * (?) as bundle_add_price", countSubQuery).
Select("((bor.total_amount-bor.amount) / nullif((bb.increase_video_number + bb.increase_limit_video_number + bb.increase_limit_video_expired_number), 0)) * (?) as bundle_add_price", countSubQuery).
Joins("left join bundle_order_records as bor on bor.uuid = bb.order_uuid collate utf8mb4_general_ci").
Joins("left join (?) as nb on bb.user_id = nb.user_id", newMonthSubQuery).
Where("nb.new_month = bb.month").