Merge branch 'ocpm_bid_engine_scores'

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/score/impl/RankServiceImpl.java

@@ -57,11 +57,19 @@ public class RankServiceImpl implements RankService {
                 getAllAdFeatureList(
                         CommonCollectionUtils.toList(request.getAdIdList(),id->id.toString())
                 );
+        //不判空
+        for(AdRankItem item:rankItems){
+            item.setBid1(1d);
+            item.setBid2(1d);
+            item.setCpa(75d);
+        }
+
         //兜底方案
         List<AdRankItem> rankResult;
         if(rankItems==null|| rankItems.size()==0){
             rankResult=rankServiceThompson.rank(param, userAdFeature, rankItems,null);
         }else {
+
             rankResult=rank(param, userAdFeature, rankItems,ScorerUtils.BASE_CONF);
         }
         log.info("svc=adItemRank rankResult={}", JSONObject.toJSONString(rankResult));