Merge branch 'refs/heads/master' into dev-xym-optimization

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

@@ -590,8 +590,8 @@ public abstract class RankStrategyBasic implements RankStrategy {
             double realCtcvr = Optional.ofNullable(param.getRealCtcvr()).orElse(0.0);
             double calibratedScore = item.getLrScore() * calibrationAlpha + (1 - calibrationAlpha) * realCtcvr;
             item.getExt().put("correctCtcvrScoreParam", JSONObject.toJSONString(param));
+            item.getScoreMap().put("cidCorrectCtcvrScore", calibratedScore);
             item.getScoreMap().put("ctcvrScore", calibratedScore);
-            item.getScoreMap().put("realCtcvr", realCtcvr);
             item.setLrScore(calibratedScore);
         }
     }
@@ -738,7 +738,8 @@ public abstract class RankStrategyBasic implements RankStrategy {
                 continue;
             }
             double correctCtcvrScore = item.getLrScore() * diff;
-            item.getScoreMap().put("correctCtcvrScore", correctCtcvrScore);
+            item.getScoreMap().put("layerCorrectCtcvrScore", correctCtcvrScore);
+            item.getScoreMap().put("ctcvrScore", correctCtcvrScore);
             item.setLrScore(correctCtcvrScore);
         }
     }