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

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

@@ -1,10 +1,10 @@
 package com.tzld.piaoquan.ad.engine.server.controller;
 
+import com.tzld.piaoquan.ad.engine.commons.dto.AdPlatformCreativeDTO;
 import com.tzld.piaoquan.ad.engine.commons.enums.GuaranteedTypeEnum;
+import com.tzld.piaoquan.ad.engine.commons.param.RankRecommendRequestParam;
 import com.tzld.piaoquan.ad.engine.service.score.RankService;
-import com.tzld.piaoquan.ad.engine.commons.dto.AdPlatformCreativeDTO;
 import com.tzld.piaoquan.ad.engine.service.score.deprecated.BidRankRecommendRequestParam;
-import com.tzld.piaoquan.ad.engine.commons.param.RankRecommendRequestParam;
 import com.tzld.piaoquan.recommend.feature.domain.ad.base.AdRankItem;
 import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.Logger;
@@ -45,7 +45,7 @@ public class AdRecommendController {
                 contentMap.put("adId", rankResult.getAdId());
                 contentMap.put("adScore", rankResult.getScore());
                 Double ctcvrScore = rankResult.getScoreMap().get("ctcvrScore");
-                if (ctcvrScore != null) {
+                if (ctcvrScore != null && ctcvrScore > 0) {
                     contentMap.put("ecpm", ctcvrScore * rankResult.getCpa() * 1000);
                     if (rankResult.getExt().get("correctionFactor") != null) {
                         contentMap.put("revisedBid", ctcvrScore * rankResult.getCpa() * (double) rankResult.getExt().get("correctionFactor"));
@@ -57,6 +57,8 @@ public class AdRecommendController {
                 }
                 if (rankResult.getExt().get("isGuaranteed") != null && rankResult.getExt().get("isGuaranteed").equals(true)) {
                     contentMap.put("type", GuaranteedTypeEnum.IS_GUARANTEED.getType());
+                } else if (rankResult.getExt().containsKey("isHotRank") && Boolean.TRUE.equals(rankResult.getExt().get("isHotRank"))) {
+                    contentMap.put("type", 2);
                 } else {
                     contentMap.put("type", GuaranteedTypeEnum.NOT_GUARANTEED.getType());
                 }

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

@@ -70,6 +70,7 @@ public class RankStrategyBy687 extends RankStrategyBasic {
         for (AdPlatformCreativeDTO dto : recallCreativeList) {
             AdRankItem adRankItem = this.creativeCovertRankItem(dto, request, noApiAdVerIds);
             this.fullCustomerInfo(feature.getCidFeature(), adRankItem);
+            adRankItem.getExt().put("isHotRank", true);
             rankItems.add(adRankItem);
         }