多样性打散

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

@@ -443,6 +443,7 @@ public class RecommendService {
         rankParam.setVersionCode(param.getVersionCode());
         rankParam.setRootSourceId(param.getRootSourceId());
         rankParam.setUserShareDepth(param.getUserShareDepth());
+        rankParam.setPageNum(param.getPageNum());
         return rankParam;
     }
 

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

@@ -32,5 +32,6 @@ public class RankParam {
     private Integer versionCode;
     private String rootSourceId;
     private Integer userShareDepth;
+    private int pageNum;
 
 }

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

@@ -37,7 +37,7 @@ public class RankStrategy4RegionMergeModelV566 extends RankStrategy4RegionMergeM
                 if (null != versionCode && versionCode == orderVersionCode) {
                     int minBid = mergeWeight.getOrDefault("minBid", 39D).intValue();
                     int keepPageNum = mergeWeight.getOrDefault("keepPageNum", 1D).intValue();
-                    if (highlyActiveUser(param.getMid(), minBid)) {
+                    if (highlyActiveUser(param.getMid(), minBid) && param.getPageNum() > keepPageNum) {
                         int group1Size = mergeWeight.getOrDefault("group1Size", 4D).intValue();
                         int group2Size = mergeWeight.getOrDefault("group2Size", 8D).intValue();
                         int group3Size = mergeWeight.getOrDefault("group3Size", 0D).intValue();