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/RankStrategyBasic.java

@@ -124,6 +124,9 @@ public abstract class RankStrategyBasic implements RankStrategy {
 
     String cidLayerKey = "ad:engine:cid:layer:info:{cid}:{userLayer}";
 
+    String userLayerDataKey = "ad:platform:{layer}:{class}:{type}:{value}";
+
+
     private static final double DEFAULT_CORRECTION = 1.0;
 
 

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

@@ -302,7 +302,7 @@ public class RankStrategyBy683 extends RankStrategyBasic {
             item.getScoreMap().put("ctcvrScore", calibratedScore);
         }
 
-        calculateCtcvrScore(result, request, scoreParam, "dnn", reqFeature);
+        calculateCtcvrScore(result, request, scoreParam, "dnn_v2", reqFeature);
         // loop
         double cpmCoefficient = weightParam.getOrDefault("cpmCoefficient", 0.9);
         boolean isGuaranteeType = false;