From e9bef82968f016d3b50ffc50ae3229ee4f03ef37 Mon Sep 17 00:00:00 2001 From: "jiaji.H" Date: Wed, 14 Jan 2026 09:21:51 +0800 Subject: [PATCH] =?UTF-8?q?Updata=EF=BC=9A=E6=9B=B4=E6=96=B0sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/dao/bundleMetrics.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/dao/bundleMetrics.go b/internal/dao/bundleMetrics.go index cc55ad4..30a8222 100644 --- a/internal/dao/bundleMetrics.go +++ b/internal/dao/bundleMetrics.go @@ -1284,7 +1284,7 @@ func MetricsArtistAccountExport(req *bundle.MetricsArtistAccountExportReq) (*bun subQuery := app.ModuleClients.BundleDB.Table("cast_media_account"). Select("artist_uuid,any_value(artist_name) as artist_name,any_value(created_at) as created_at"). Group("artist_uuid"). - Where("deleted_at = 0 and expired = 1") + Where("deleted_at = 0 and expired != 2") //如果选择了月份 if len(req.Month) > 0 { // 构建多个月份的时间范围条件（使用 OR 连接） @@ -1331,15 +1331,15 @@ 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 and expired = 1) tiktok on tiktok.artist_uuid = cma.artist_uuid`). + Joins(`left join (SELECT * FROM cast_media_account where platform_id = 1 and deleted_at = 0 and expired != 2) 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_account where platform_id = 4 and deleted_at = 0 and expired != 2) 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 and expired = 1) 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 != 2) 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 and expired = 1) 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 != 2) 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 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 != 2) 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")