883

 新竞价
新计价
886
旧竞价
Copc的计价
887
旧竞价
 f的计价

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

@@ -465,17 +465,10 @@ public class RankStrategyBy886 extends RankStrategyBasic {
                 participateCompetitionType.add("guarantee");
             }
             top1Item.getExt().put("participateCompetitionType", StringUtils.join(participateCompetitionType, ","));
-            Double modelCtcvrScore = top1Item.getScoreMap().get("modelCtcvrScore");
-            Double ctcvrScore = top1Item.getScoreMap().get("ctcvrScore");
+            top1Item.getExt().put("ecpm", top1Item.getScoreMap().get("ecpm"));
             if (scoreParam.getExpCodeSet().contains(checkoutEcpmExp)) {
-                top1Item.getExt().put("ecpm", ctcvrScore * top1Item.getCpa() * 1000);
                 String filterEcpmValue = paramsMap.getOrDefault("filterEcpm", filterEcpm);
                 top1Item.getExt().put("filterEcpm", filterEcpmValue);
-                if (noApiAdVerIds.contains(top1Item.getAdVerId())) {
-                    top1Item.getExt().put("ecpm", top1Item.getCpm());
-                }
-            } else {
-                top1Item.getExt().put("ecpm", modelCtcvrScore * top1Item.getCpa() * 1000);
             }
             putMetaFeature(top1Item, feature, reqFeature, sceneFeatureMap, request);
             top1Item.getExt().put("model", logModelName);

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

@@ -465,17 +465,10 @@ public class RankStrategyBy887 extends RankStrategyBasic {
                 participateCompetitionType.add("guarantee");
             }
             top1Item.getExt().put("participateCompetitionType", StringUtils.join(participateCompetitionType, ","));
-            Double modelCtcvrScore = top1Item.getScoreMap().get("modelCtcvrScore");
-            Double ctcvrScore = top1Item.getScoreMap().get("ctcvrScore");
+            top1Item.getExt().put("ecpm", top1Item.getScoreMap().get("ecpm"));
             if (scoreParam.getExpCodeSet().contains(checkoutEcpmExp)) {
-                top1Item.getExt().put("ecpm", ctcvrScore * top1Item.getCpa() * 1000);
                 String filterEcpmValue = paramsMap.getOrDefault("filterEcpm", filterEcpm);
                 top1Item.getExt().put("filterEcpm", filterEcpmValue);
-                if (noApiAdVerIds.contains(top1Item.getAdVerId())) {
-                    top1Item.getExt().put("ecpm", top1Item.getCpm());
-                }
-            } else {
-                top1Item.getExt().put("ecpm", modelCtcvrScore * top1Item.getCpa() * 1000);
             }
             putMetaFeature(top1Item, feature, reqFeature, sceneFeatureMap, request);
             top1Item.getExt().put("model", logModelName);