Merge branch 'feature_20240507_supeng_supply_ab' of algorithm/recommend-server into master

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/rank/RankService.java

@@ -293,7 +293,14 @@ public class RankService {
         if (CollectionUtils.isNotEmpty(quickFlowPoolVideos)) {
             return quickFlowPoolVideos;
         } else {
-            return extractAndSort(param, FlowPoolConstants.PUSH_FORM);
+//            return extractAndSort(param, FlowPoolConstants.PUSH_FORM);
+            //供给流量池 新增pushForm；由于供给流量池占比小，先判断 正常流量池
+            List<Video> flowPoolVideos = extractAndSort(param, FlowPoolConstants.PUSH_FORM);
+            if (CollectionUtils.isNotEmpty(quickFlowPoolVideos)) {
+                return flowPoolVideos;
+            } else {
+                return extractAndSort(param, FlowPoolConstants.SUPPLY_PUSH_FORM);
+            }
         }
     }