Merge branch 'refs/heads/dev-xym-fix' into pre-master

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

@@ -395,8 +395,6 @@ public abstract class RankStrategyBasic implements RankStrategy {
     }
 
     protected Map<Long, CorrectCpaParam> getCorrectCpaParamMap(RankRecommendRequestParam request, ScoreParam scoreParam, Map<String, String> reqFeature) {
-        Map<String, String> userLayer = this.getUserLayer(request.getMid());
-
         String layer = reqFeature.get("layer");
         String clazz = reqFeature.get("clazz");
         Map<Long, CorrectCpaParam> resultMap = new HashMap<>();
@@ -443,10 +441,10 @@ public abstract class RankStrategyBasic implements RankStrategy {
         // 安全获取值
         Integer viewsHour = jsonObject.getInteger("viewsHour");
         Integer viewsDay = jsonObject.getInteger("viewsDay");
-        double realCtcvrHour = safeDouble(jsonObject.getDouble("realCtcvrHour"), minCtcvr);
-        double pCtcvrHour = jsonObject.getDouble("pCtcvrHour");
-        double realCtcvrDay = safeDouble(jsonObject.getDouble("realCtcvrDay"), minCtcvr);
-        double pCtcvrDay = jsonObject.getDouble("pCtcvrDay");
+        Double realCtcvrHour = safeDouble(jsonObject.getDouble("realCtcvrHour"), minCtcvr);
+        Double pCtcvrHour = jsonObject.getDouble("pCtcvrHour");
+        Double realCtcvrDay = safeDouble(jsonObject.getDouble("realCtcvrDay"), minCtcvr);
+        Double pCtcvrDay = jsonObject.getDouble("pCtcvrDay");
 
         if (scoreParam.getExpCodeSet().contains(correctCpaExp2)) {
             double alpha = isValidViews(viewsHour, correctCpaViewHour) ? correctCpaAlpha2 : 0;