Merge branch 'feat-hjj-ExportManager' into dev

This commit is contained in:
jiaji.H 2026-01-14 09:12:28 +08:00
commit e4a8968a4c

View File

@ -1380,7 +1380,7 @@ func MetricsArtistAccountExport(req *bundle.MetricsArtistAccountExportReq) (*bun
Joins(`left join (Select * from cast_media_account where platform_id = 5 and deleted_at = 0 and expired = 1) bluesky on bluesky.artist_uuid = cma.artist_uuid`). Joins(`left join (Select * from cast_media_account where platform_id = 5 and deleted_at = 0 and expired = 1) bluesky on bluesky.artist_uuid = cma.artist_uuid`).
Joins(`left join (Select * from cast_media_auth where platform_id = 5 and deleted_at = 0) bluesky_auth on bluesky_auth.user_id = bluesky.user_id`). Joins(`left join (Select * from cast_media_auth where platform_id = 5 and deleted_at = 0) bluesky_auth on bluesky_auth.user_id = bluesky.user_id`).
Joins(`left join bundle_order_records bor on bor.customer_id COLLATE utf8mb4_general_ci= cma.artist_uuid COLLATE utf8mb4_general_ci`). Joins(`left join bundle_order_records bor on bor.customer_id COLLATE utf8mb4_general_ci= cma.artist_uuid COLLATE utf8mb4_general_ci`).
Where("bor.deleted_at is null and cma.expired = 1") Where("bor.deleted_at is null")
err = query.Find(&data.Data).Error err = query.Find(&data.Data).Error
if err != nil { if err != nil {
return nil, err return nil, err