Merge branch 'dev-xym-update' of algorithm/ad-engine into master

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/score/strategy/RankStrategyBy687.java

@@ -126,7 +126,7 @@ public class RankStrategyBy687 extends RankStrategyBasic {
 
         String layer = userLayer.getOrDefault("layer", "无曝光");
         String clazz = userLayer.getOrDefault("class", "近期未出现");
-        if(Objects.equals(layer, "已转化")){
+        if (Objects.equals(layer, "已转化")) {
             layer = "有转化";
         }
         if (request.getIsFilterUser()) {
@@ -244,7 +244,10 @@ public class RankStrategyBy687 extends RankStrategyBasic {
             HotRankFeatureInfo prev = rankItem.get(i - 1);
             double currWeight1 = prev.getWeight() * (1 - (1 - curr.getCpm() / prev.getCpm()) * hotRankCalcWeightCoefficient);
             double currWeight2 = prev.getWeight() / hotRankCalcWeightCoefficient;
-            double currWeight = Math.max(currWeight1, currWeight2);
+            double currWeight = Math.min(currWeight1, currWeight2);
+            if (currWeight <= 1) {
+                currWeight = Math.max(currWeight1, currWeight2);
+            }
             curr.setWeight(Math.max(1, currWeight));
         }
     }