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

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

ad-engine-server/src/main/java/com/tzld/piaoquan/ad/engine/server/controller/AdRecommendController.java

@@ -56,6 +56,9 @@ public class AdRecommendController {
                     if (rankResult.getExt().get("ecpm") != null) {
                         contentMap.put("ecpm", rankResult.getExt().get("ecpm"));
                     }
+                    if (rankResult.getExt().get("filterEcpm") != null) {
+                        contentMap.put("filterEcpm", rankResult.getExt().get("filterEcpm"));
+                    }
                     if (rankResult.getExt().get("correctionFactor") != null) {
                         contentMap.put("revisedBid", ctcvrScore * rankResult.getCpa() * (double) rankResult.getExt().get("correctionFactor"));
                     } else {

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

@@ -104,6 +104,9 @@ public abstract class RankStrategyBasic implements RankStrategy {
     @Value("${checkout.ecpm.exp:790}")
     protected String checkoutEcpmExp;
 
+    @Value("${filter.ecpm:60}")
+    protected String filterEcpm;
+
     @Autowired
     private FeatureService featureService;
     @Autowired

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

@@ -362,6 +362,7 @@ public class RankStrategyBy688 extends RankStrategyBasic {
             Double ctcvrScore = top1Item.getScoreMap().get("ctcvrScore");
             if (scoreParam.getExpCodeSet().contains(checkoutEcpmExp)) {
                 top1Item.getExt().put("ecpm", ctcvrScore * top1Item.getCpa() * 1000);
+                top1Item.getExt().put("filterEcpm", filterEcpm);
                 log.info("ecpm exp={}", ctcvrScore * top1Item.getCpa() * 1000);
             } else {
                 top1Item.getExt().put("ecpm", modelCtcvrScore * top1Item.getCpa() * 1000);