Merge branch '20260708-wyp-fix' into test

api-module/src/main/java/com/tzld/piaoquan/api/common/enums/contentplatform/PriorDimensionEnum.java

@@ -11,7 +11,9 @@ public enum PriorDimensionEnum {
     PREMIUM("传播的头部"),
     GROWTH("增长的头部"),
     DISTRIBUTION("传播的分发"),
-    GROWTH_DISTRIBUTION("增长的分发");
+    GROWTH_DISTRIBUTION("增长的分发"),
+
+    UNDEFINED("不区分");
 
     private final String value;
 

api-module/src/main/java/com/tzld/piaoquan/api/model/vo/contentplatform/GzhPlanVideoContentItemVO.java

@@ -35,4 +35,7 @@ public class GzhPlanVideoContentItemVO {
 
     @ApiModelProperty(value = "推送链接")
     private String pageUrl;
+
+    @ApiModelProperty(value = "匹配实验id")
+    private String experimentId;
 }

api-module/src/main/java/com/tzld/piaoquan/api/service/contentplatform/impl/ContentPlatformPlanServiceImpl.java

@@ -237,6 +237,7 @@ public class ContentPlatformPlanServiceImpl implements ContentPlatformPlanServic
                     videoItemVO.setCustomCoverType(video.getCustomCoverType());
                     videoItemVO.setVideo(video.getVideo());
                     videoItemVO.setPageUrl(video.getPageUrl());
+                    videoItemVO.setExperimentId(video.getExperimentId());
                     if (Objects.nonNull(bucketDataMapByGhId) && bucketDataMapByGhId.containsKey(video.getVideoId())
                             && planItemVO.getType().equals(ContentPlatformGzhPlanTypeEnum.AUTO_REPLY.getVal())) {
                         CgiReplyBucketData bucketData = bucketDataMapByGhId.get(video.getVideoId());
@@ -676,9 +677,8 @@ public class ContentPlatformPlanServiceImpl implements ContentPlatformPlanServic
         } else if (channel == DemandChannelEnum.XCX) {
             // 小程序投流：干掉 增长头部*向量匹配、增长头部*泛化*精准匹配、传播头部*场景已看
             configs.removeIf(cfg ->
-                    (cfg.dimension == PriorDimensionEnum.GROWTH && cfg.demandType == DemandTypeEnum.STANDARD && cfg.matchMethod == DemandMatchMethodEnum.VECTOR_SIMILARITY)
-                            || (cfg.dimension == PriorDimensionEnum.GROWTH && cfg.demandType == DemandTypeEnum.GENERALIZED && cfg.matchMethod == DemandMatchMethodEnum.PRECISION)
-                            || (cfg.dimension == PriorDimensionEnum.PREMIUM && cfg.demandType == DemandTypeEnum.STANDARD && cfg.matchMethod == DemandMatchMethodEnum.SCENE));
+                    (cfg.dimension == PriorDimensionEnum.GROWTH && cfg.demandType == DemandTypeEnum.GENERALIZED && cfg.matchMethod == DemandMatchMethodEnum.PRECISION));
+            configs.add(new PriorPoolConfig(PriorDimensionEnum.UNDEFINED, DemandTypeEnum.STANDARD, DemandMatchMethodEnum.PRECISION, true));
         } else if (channel == DemandChannelEnum.QW) {
             // 企微合作：干掉 传播头部*泛化*精准匹配、传播分发*泛化*精准匹配
             configs.removeIf(cfg ->