internal/dao/bundleMetrics.go

@@ -711,16 +711,16 @@ func MetricsArtistAccountExport(req *bundle.MetricsArtistAccountExportReq) (*bun
 	query := app.ModuleClients.BundleDB.Table("(select artist_uuid,any_value(artist_name) as artist_name,any_value(created_at) as created_at from  cast_media_account group by artist_uuid ) cma").
 		Select(`tiktok.platform_user_id as tiktok_account,
 		tiktok.platform_user_name as tiktok_nickname, 
-		dm.platform_user_id as dm_account, 
-		dm.platform_user_name as dm_nickname, 
+		youtube.platform_user_id as youtube_account, 
+		youtube.platform_user_name as youtube_nickname, 
 		ins.platform_user_id as instagram_account, 
 		ins.platform_user_name as instagram_nickname,
 		cma.artist_name,
 		bor.customer_num as user_num
 		`).
 		Joins(`left join (SELECT * FROM cast_media_account where platform_id = 1) tiktok on tiktok.artist_uuid = cma.artist_uuid`).
-		Joins(`left join (SELECT * FROM cast_media_account where platform_id = 4) dm on dm.artist_uuid = cma.artist_uuid`).
-		Joins(`left join (SELECT * FROM cast_media_account where platform_id = 3) ins on ins.artist_uuid = cma.artist_uuid`).
+		Joins(`left join (SELECT * FROM cast_media_account where platform_id = 3) youtube on youtube.artist_uuid = cma.artist_uuid`).
+		Joins(`left join (SELECT * FROM cast_media_account where platform_id = 4) ins on ins.artist_uuid = cma.artist_uuid`).
 		Joins(`left join bundle_order_records bor on bor.customer_id  COLLATE utf8mb4_general_ci= cma.artist_uuid  COLLATE utf8mb4_general_ci`)
 
 	if req.Month != "" {
@@ -742,12 +742,12 @@ func MetricsVideoSubmitExport(req *bundle.MetricsVideoSubmitExportReq) (result *
 		Select(`cw.artist_name ,
 	cw.title as video_title, 
 	tiktok.created_at as tiktok_upload_time,
-	dm.created_at as dm_upload_time,
+	youtube.created_at as youtube_upload_time,
 	ins.created_at as instagram_upload_time,
 	bor.customer_num as user_num`).
 		Joins("left join (select  created_at,work_uuid  from cast_work_platform_info cwi where cwi.platform_id = 1) tiktok on tiktok.work_uuid = cw.uuid").
-		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 (select  created_at,work_uuid  from cast_work_platform_info cwi where cwi.platform_id = 3) youtube on youtube.work_uuid = cw.uuid").
+		Joins("left join (select  created_at,work_uuid  from cast_work_platform_info cwi where cwi.platform_id = 4) 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").
 		Order("cw.artist_name")
 	if req.Month != "" {

pb/bundle.proto

@@ -1491,10 +1491,8 @@ message MetricsArtistAccountExportResp{
 message MetricsArtistAccountExportItem{
   string artistName = 1;
   string userNum = 2;
-  string dmAccount = 3;
-  string dmNickname = 4;
-  // string youtubeAccount = 3;  现在没有YouTube了
-  // string youtubeNickname = 4;
+  string youtubeAccount = 3;
+  string youtubeNickname = 4;
   string instagramAccount = 5;
   string instagramNickname = 6;
   string tiktokAccount = 7;
@@ -1515,7 +1513,7 @@ message MetricsVideoSubmitExportItem {
   string artistName = 1;
   string userNum = 2;
   string videoTitle = 3;
-  int64 dmUploadTime = 4;
+  int64 youtubeUploadTime = 4;
   int64 instagramUploadTime = 5;
   int64 tiktokUploadTime = 6;
 }

pb/bundle/bundle_triple.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go-triple. DO NOT EDIT.
 // versions:
-// - protoc-gen-go-triple v1.0.8
-// - protoc             v3.12.4
+// - protoc-gen-go-triple v1.0.5
+// - protoc             v5.26.0
 // source: pb/bundle.proto
 
 package bundle