流量选品-通过分类标记类型调整

Pyspark_job/doris_handle/dwt_flow_asin_month.py

@@ -1048,7 +1048,7 @@ SELECT
     COALESCE(cf.nsr_30day_count, 0)                          AS nsr_seen_count_30d,
     f.asin_type,
     uma.usr_mask_progress,
-    COALESCE(uma.usr_mask_type, umc.usr_mask_type) AS usr_mask_type,
+    COALESCE(uma.usr_mask_type, umn.usr_mask_type, umc.usr_mask_type) AS usr_mask_type,
     COALESCE(f.auctions_num,       0) AS auctions_num,
     COALESCE(f.auctions_num_all,   0) AS auctions_num_all,
     COALESCE(f.skus_num_creat,     0) AS skus_num_creat,
@@ -1079,7 +1079,18 @@ LEFT JOIN `dwd`.`dwd_asin_profit_rate_latest` pr
 LEFT JOIN `dwd`.`dwd_keepa_asin_detail` kp
     ON f.asin = kp.asin AND kp.site_name = '{site_name}'
 LEFT JOIN `selection`.`user_mask_asin` uma ON f.asin = uma.asin
-LEFT JOIN `selection`.`user_mask_category` umc ON f.category_id = umc.category_id
+LEFT JOIN (
+    SELECT node_id, MAX_BY(usr_mask_type, last_update_time) AS usr_mask_type
+    FROM `selection`.`user_mask_category`
+    WHERE site_name = '{site_name}' AND node_id IS NOT NULL AND node_id != ''
+    GROUP BY node_id
+) umn ON f.node_id = umn.node_id
+LEFT JOIN (
+    SELECT category_id, MAX_BY(usr_mask_type, last_update_time) AS usr_mask_type
+    FROM `selection`.`user_mask_category`
+    WHERE site_name = '{site_name}'
+    GROUP BY category_id
+) umc ON f.category_id = umc.category_id
 LEFT JOIN (
     SELECT asin, asin_cate_flag, bsr_latest_date, bsr_30day_count, nsr_latest_date, nsr_30day_count
     FROM `dwd`.`dwd_asin_source_flag`
@@ -1440,7 +1451,7 @@ SELECT
     CAST(-1 AS SMALLINT) AS bsr_best_orders_type,
     f.asin_type,
     uma.usr_mask_progress,
-    COALESCE(uma.usr_mask_type, umc.usr_mask_type) AS usr_mask_type,
+    COALESCE(uma.usr_mask_type, umn.usr_mask_type, umc.usr_mask_type) AS usr_mask_type,
     COALESCE(f.auctions_num,       0) AS auctions_num,
     COALESCE(f.auctions_num_all,   0) AS auctions_num_all,
     COALESCE(f.skus_num_creat,     0) AS skus_num_creat,
@@ -1499,7 +1510,18 @@ LEFT JOIN `dwd`.`dwd_keepa_asin_detail` kp
     ON f.asin = kp.asin AND kp.site_name = '{site_name}'
 -- ===== 用户标记 ASIN/品类 =====
 LEFT JOIN `selection`.`user_mask_asin`     uma ON f.asin        = uma.asin
-LEFT JOIN `selection`.`user_mask_category` umc ON f.category_id = umc.category_id
+LEFT JOIN (
+    SELECT node_id, MAX_BY(usr_mask_type, last_update_time) AS usr_mask_type
+    FROM `selection`.`user_mask_category`
+    WHERE site_name = '{site_name}' AND node_id IS NOT NULL AND node_id != ''
+    GROUP BY node_id
+) umn ON f.node_id = umn.node_id
+LEFT JOIN (
+    SELECT category_id, MAX_BY(usr_mask_type, last_update_time) AS usr_mask_type
+    FROM `selection`.`user_mask_category`
+    WHERE site_name = '{site_name}'
+    GROUP BY category_id
+) umc ON f.category_id = umc.category_id
 -- ===== 品牌推荐原因——
 LEFT JOIN (
     SELECT brand, brand_badge_reason

Pyspark_job/doris_handle/dwt_flow_asin_week.py

@@ -861,7 +861,7 @@ SELECT
     COALESCE(f.nsr_seen_count_30d, 0)                         AS nsr_seen_count_30d,
     f.asin_type,
     uma.usr_mask_progress,
-    COALESCE(uma.usr_mask_type, umc.usr_mask_type) AS usr_mask_type,
+    COALESCE(uma.usr_mask_type, umn.usr_mask_type, umc.usr_mask_type) AS usr_mask_type,
     COALESCE(f.auctions_num,       0) AS auctions_num,
     COALESCE(f.auctions_num_all,   0) AS auctions_num_all,
     COALESCE(f.skus_num_creat,     0) AS skus_num_creat,
@@ -907,7 +907,18 @@ LEFT JOIN `dwd`.`dwd_asin_profit_rate_latest` pr
 LEFT JOIN `dwd`.`dwd_keepa_asin_detail` kp
     ON f.asin = kp.asin AND kp.site_name = '{site_name}'
 LEFT JOIN `selection`.`user_mask_asin` uma ON f.asin = uma.asin
-LEFT JOIN `selection`.`user_mask_category` umc ON f.category_id = umc.category_id
+LEFT JOIN (
+    SELECT node_id, MAX_BY(usr_mask_type, last_update_time) AS usr_mask_type
+    FROM `selection`.`user_mask_category`
+    WHERE site_name = '{site_name}' AND node_id IS NOT NULL AND node_id != ''
+    GROUP BY node_id
+) umn ON f.node_id = umn.node_id
+LEFT JOIN (
+    SELECT category_id, MAX_BY(usr_mask_type, last_update_time) AS usr_mask_type
+    FROM `selection`.`user_mask_category`
+    WHERE site_name = '{site_name}'
+    GROUP BY category_id
+) umc ON f.category_id = umc.category_id
 -- ===== 品牌徽章（取最新一期月数据，date_info=yyyy-MM） =====
 LEFT JOIN (
     SELECT brand, brand_badge_reason