Merge branch 'cooperation_video_candidate_pool_improved_lld_0509' into test

api-module/src/main/resources/mapper/contentplatform/ext/ContentPlatformDemandVideoMapperExt.xml

@@ -88,7 +88,9 @@
                match_text, title, cover, video, experiment_id, status, create_timestamp, update_timestamp
         FROM content_platform_demand_video
         WHERE dt = #{dt} AND status = 1
+        <if test="channelName == null || channelName != '公众号合作-Daily-自选'">
         AND (category IS NULL OR category NOT IN ('早中晚好','节日祝福'))
+        </if>
         <if test="channelName != null and channelName != ''">
             AND channel_name = #{channelName}
         </if>

docs/recommend-ordering.md

@@ -44,7 +44,8 @@ source 空（默认）  ──────►  四路随机穿插 (getInterleave
 
 > 优质相似池 SQL **不**加 `drive_dimension_time` 条件(主查与 ghName/跨渠道退化路径一致),可包含「昨日」以外驱动时间档位的数据。
 
-公共强过滤（所有 demand 池 SQL）：`dt = max(dt)` AND `status = 1` AND `crowd_segment = user.channel` AND `channel_name = resolveChannelName(param)`(可空)。
+公共强过滤（所有 demand 池 SQL）：`dt = max(dt)` AND `status = 1` AND `crowd_segment = user.channel` AND `channel_name = resolveChannelName(param)`(可空)。  
+例外：`channel_name = '公众号合作-Daily-自选'` 时不加「早中晚好 / 节日祝福」`category` 黑名单条件（其它渠道仍过滤）。
 
 ### 2.1 `resolveChannelName(param)` — 入口 → `channel_name` 映射