Merge branch 'master' into recall_config

Conflicts:
	service/src/main/java/com/yoho/search/recall/SceneRecallProductListService.java
	service/src/main/java/com/yoho/search/recall/beans/builder/CommonRecallRequestBuilder.java
	service/src/main/java/com/yoho/search/service/list/ProductListSwitchService.java

@@ -8,7 +8,6 @@ import com.yoho.search.base.utils.Transfer;
 import com.yoho.search.core.es.model.SearchParam;
 import com.yoho.search.core.es.model.SearchResult;
 import com.yoho.search.models.SearchApiResult;
-import com.yoho.search.common.utils.ABUserPartitionUtils;
 import com.yoho.search.recall.beans.builder.UserRecallRequestBuilder;
 import com.yoho.search.recall.beans.cache.SknReturnInfoCacheBean;
 import com.yoho.search.recall.beans.cache.UserRecallCacheBean;
@@ -165,7 +164,7 @@ public class SceneRecallProductListService {
     private List<RecallSknInfo> queryProductSknByFilterSkn(UserRecallRequest userRecallRequest, List<RecallSknInfo> recallSknInfos, int realPage, int pageSize) {
         long begin = System.currentTimeMillis();
         //0、策略区分
-        StrategyEnum strategyEnum = ABUserPartitionUtils.isAUserComplete(userRecallRequest.getUid(), userRecallRequest.getUdid()) ? StrategyEnum.DEFAULT_HEAT_VALUE : StrategyEnum.DEFAULT_CTR_VALUE;
+        StrategyEnum strategyEnum =StrategyEnum.DEFAULT_HEAT_VALUE;
 
         //1、设置query
         SearchParam searchParam = new SearchParam();

@@ -40,11 +40,7 @@ public class CommonRecallRequestBuilder {
         //1.4) 流量补偿的召回
         requests.add(this.buildAddFlowRequest(paramQueryFilter,userRecallRequest.getPageId()));
         //1.5) 页面的兜底召回
-        if (ABUserPartitionUtils.isAUserComplete(userRecallRequest.getUid(), userRecallRequest.getUdid())) {
-            requests.add(this.buildCommonHeatValueStrategy(paramQueryFilter, pageSize));
-        } else {
-            requests.add(this.buildCommonCtrValueStrategy(paramQueryFilter, pageSize));
-        }
+        requests.add(this.buildCommonHeatValueStrategy(paramQueryFilter, pageSize));
         return requests;
     }