Fix ctcvrScore log

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

@@ -215,14 +215,13 @@ public class RankStrategyBy679 extends RankStrategyBasic {
 
             double scoreCoefficient = creativeScoreCoefficient.getOrDefault(item.getAdId(), 1d);
             double guaranteeScoreCoefficient = getGuaranteeScoreCoefficient(scoreParam, item.getExt());
-            double ctcvrScore = item.getLrScore() * scoreCoefficient * item.getCpa();
-            item.setScore(ctcvrScore * guaranteeScoreCoefficient);
+            double finalScore = item.getLrScore() * scoreCoefficient * item.getCpa() * guaranteeScoreCoefficient;
+            item.setScore(finalScore);
             item.getScoreMap().put("guaranteeScoreCoefficient", guaranteeScoreCoefficient);
             item.getScoreMap().put("cpa", item.getCpa());
             item.getScoreMap().put("cpm", item.getCpm());
             item.getScoreMap().put("cpmCoefficient", cpmCoefficient);
             item.getScoreMap().put("scoreCoefficient", scoreCoefficient);
-            item.getScoreMap().put("ctcvrScore", ctcvrScore);
             item.getFeatureMap().putAll(userFeatureMap);
             item.getFeatureMap().putAll(sceneFeatureMap);
 

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

@@ -233,14 +233,13 @@ public class RankStrategyBy680 extends RankStrategyBasic {
 
             double scoreCoefficient = creativeScoreCoefficient.getOrDefault(item.getAdId(), 1d);
             double guaranteeScoreCoefficient = getGuaranteeScoreCoefficient(scoreParam, item.getExt());
-            double ctcvrScore = item.getLrScore() * scoreCoefficient * item.getCpa();
-            item.setScore(ctcvrScore * guaranteeScoreCoefficient);
+            double finalScore = item.getLrScore() * scoreCoefficient * item.getCpa() * guaranteeScoreCoefficient;
+            item.setScore(finalScore);
             item.getScoreMap().put("guaranteeScoreCoefficient", guaranteeScoreCoefficient);
             item.getScoreMap().put("cpa", item.getCpa());
             item.getScoreMap().put("cpm", item.getCpm());
             item.getScoreMap().put("cpmCoefficient", cpmCoefficient);
             item.getScoreMap().put("scoreCoefficient", scoreCoefficient);
-            item.getScoreMap().put("ctcvrScore", ctcvrScore);
             item.getFeatureMap().putAll(userFeatureMap);
             item.getFeatureMap().putAll(sceneFeatureMap);
 

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

@@ -234,14 +234,13 @@ public class RankStrategyBy683 extends RankStrategyBasic {
 
             double scoreCoefficient = creativeScoreCoefficient.getOrDefault(item.getAdId(), 1d);
             double guaranteeScoreCoefficient = getGuaranteeScoreCoefficient(scoreParam, item.getExt());
-            double ctcvrScore = item.getLrScore() * scoreCoefficient * item.getCpa();
-            item.setScore(ctcvrScore * guaranteeScoreCoefficient);
+            double finalScore = item.getLrScore() * scoreCoefficient * item.getCpa() * guaranteeScoreCoefficient;
+            item.setScore(finalScore);
             item.getScoreMap().put("guaranteeScoreCoefficient", guaranteeScoreCoefficient);
             item.getScoreMap().put("cpa", item.getCpa());
             item.getScoreMap().put("cpm", item.getCpm());
             item.getScoreMap().put("cpmCoefficient", cpmCoefficient);
             item.getScoreMap().put("scoreCoefficient", scoreCoefficient);
-            item.getScoreMap().put("ctcvrScore", ctcvrScore);
             item.getFeatureMap().putAll(userFeatureMap);
             item.getFeatureMap().putAll(sceneFeatureMap);
 

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

@@ -223,12 +223,11 @@ public class RankStrategyBy687 extends RankStrategyBasic {
         long time3 = System.currentTimeMillis();
         for (AdRankItem item : result) {
             double guaranteeScoreCoefficient = getGuaranteeScoreCoefficient(scoreParam, item.getExt());
-            double ctcvrScore = item.getLrScore() * item.getCpa();
-            item.setScore(ctcvrScore * guaranteeScoreCoefficient);
+            double finalScore = item.getLrScore()  * item.getCpa() * guaranteeScoreCoefficient;
+            item.setScore(finalScore);
             item.getScoreMap().put("guaranteeScoreCoefficient", guaranteeScoreCoefficient);
             item.getScoreMap().put("cpa", item.getCpa());
             item.getScoreMap().put("cpm", item.getCpm());
-            item.getScoreMap().put("ctcvrScore", ctcvrScore);
             item.getFeatureMap().putAll(userFeatureMap);
             item.getFeatureMap().putAll(sceneFeatureMap);
 

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

@@ -276,14 +276,13 @@ public class RankStrategyBy688 extends RankStrategyBasic {
 
             double scoreCoefficient = creativeScoreCoefficient.getOrDefault(item.getAdId(), 1d);
             double guaranteeScoreCoefficient = getGuaranteeScoreCoefficient(scoreParam, item.getExt());
-            double ctcvrScore = item.getLrScore() * scoreCoefficient * item.getCpa();
-            item.setScore(ctcvrScore * guaranteeScoreCoefficient);
+            double finalScore = item.getLrScore() * scoreCoefficient * item.getCpa() * guaranteeScoreCoefficient;
+            item.setScore(finalScore);
             item.getScoreMap().put("guaranteeScoreCoefficient", guaranteeScoreCoefficient);
             item.getScoreMap().put("cpa", item.getCpa());
             item.getScoreMap().put("cpm", item.getCpm());
             item.getScoreMap().put("cpmCoefficient", cpmCoefficient);
             item.getScoreMap().put("scoreCoefficient", scoreCoefficient);
-            item.getScoreMap().put("ctcvrScore", ctcvrScore);
             item.getFeatureMap().putAll(userFeatureMap);
             item.getFeatureMap().putAll(sceneFeatureMap);