From 0524d503f306eef58b561871708c4d75407c29c6 Mon Sep 17 00:00:00 2001 From: "jiaji.H" Date: Wed, 14 Jan 2026 09:08:06 +0800 Subject: [PATCH] =?UTF-8?q?Updata=EF=BC=9A=E5=A2=9E=E5=8A=A0=E5=A5=97?= =?UTF-8?q?=E9=A4=90=E8=BF=87=E6=9C=9F=E8=BF=87=E8=99=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/dao/bundleMetrics.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/internal/dao/bundleMetrics.go b/internal/dao/bundleMetrics.go index 847ae1a..609c740 100644 --- a/internal/dao/bundleMetrics.go +++ b/internal/dao/bundleMetrics.go @@ -1331,18 +1331,18 @@ func MetricsArtistAccountExport(req *bundle.MetricsArtistAccountExportReq) (*bun cma.artist_name, bor.customer_num as user_num `). - Joins(`left join (SELECT * FROM cast_media_account where platform_id = 1 and deleted_at = 0) tiktok on tiktok.artist_uuid = cma.artist_uuid`). - Joins(`left join (Select * from cast_media_auth where platform_id = 1 and deleted_at = 0) tiktok_auth on tiktok_auth.user_id = tiktok.user_id`). - Joins(`left join (SELECT * FROM cast_media_account where platform_id = 4 and deleted_at = 0) dm on dm.artist_uuid = cma.artist_uuid`). + Joins(`left join (SELECT * FROM cast_media_account where platform_id = 1 and deleted_at = 0 and expired = 1) tiktok on tiktok.artist_uuid = cma.artist_uuid`). + Joins(`left join (Select * from cast_media_auth where platform_id = 1 and deleted_at = 0 ) tiktok_auth on tiktok_auth.user_id = tiktok.user_id`). + Joins(`left join (SELECT * FROM cast_media_account where platform_id = 4 and deleted_at = 0 and expired = 1) dm on dm.artist_uuid = cma.artist_uuid`). Joins(`left join (Select * from cast_media_auth where platform_id = 4 and deleted_at = 0) dm_auth on dm_auth.user_id = dm.user_id`). - Joins(`left join (SELECT * FROM cast_media_account where platform_id = 3 and deleted_at = 0) ins on ins.artist_uuid = cma.artist_uuid`). + Joins(`left join (SELECT * FROM cast_media_account where platform_id = 3 and deleted_at = 0 and expired = 1) ins on ins.artist_uuid = cma.artist_uuid`). Joins(`left join (Select * from cast_media_auth where platform_id = 3 and deleted_at = 0) ins_auth on ins_auth.user_id = ins.user_id`). - Joins(`left join (Select * from cast_media_account where platform_id = 2 and deleted_at = 0) youtube on youtube.artist_uuid = cma.artist_uuid`). + Joins(`left join (Select * from cast_media_account where platform_id = 2 and deleted_at = 0 and expired = 1) youtube on youtube.artist_uuid = cma.artist_uuid`). Joins(`left join (Select * from cast_media_auth where platform_id = 2 and deleted_at = 0) youtube_auth on youtube_auth.user_id = youtube.user_id`). - Joins(`left join (Select * from cast_media_account where platform_id = 5 and deleted_at = 0) 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 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") + Where("bor.deleted_at is null and cma.expired = 1") err = query.Find(&data.Data).Error if err != nil { return nil, err