Merge branch 'master' into promotion

@@ -38,7 +38,7 @@ public class BatchRecallCacheBean extends AbstractCacheBean<RecallRequest,Recall
             results.add(new RecallRequestResponse(request));
         }
         //2、执行查询
-        this.bacthFillResponseWithCache(results,40);
+        this.bacthFillResponseWithCache(results,60);
         //3、返回结果
         return results;
     }

@@ -2,7 +2,6 @@ package com.yoho.search.recall.scene.beans.strategy;
 
 public enum  SortBrandType {
     REC_SORT_BRAND,
-    PRED_SORT_BRAND,
     VEC_RNN_SORT_BRAND,
     VEC_W2V_SORT_BRAND
 }

@@ -32,7 +32,7 @@ public class SortBrandNewShelveStrategy extends SortBrandAbstractStrategy {
 
 	@Override
 	public SortBuilder<?> sortBuilder() {
-		return SortBuilderHelper.getFirstShelveTimeDescSort();
+		return SortBuilderHelper.getRandomSort();
 	}
 
 }

@@ -32,7 +32,7 @@ public class SortBrandReducePriceStrategy extends SortBrandAbstractStrategy {
 
 	@Override
 	public SortBuilder<?> sortBuilder() {
-		return SortBuilderHelper.getLastReducePriceTimeDescSort();
+		return SortBuilderHelper.getRandomSort();
 	}
 
 }

@@ -2,11 +2,11 @@ package com.yoho.search.recall.scene.constants;
 
 public class RecallCommonConstants {
 
-    public static final int maxRealTimeSortBrandCount = 15;//截取【品牌-品类】的数量-for召回【10->15】
+    public static final int maxRealTimeSortBrandCount = 12;//截取【品牌-品类】的数量-for召回【10->15】
 
-    public static final int maxVectorRNNSortBrandCount = 6;//截取【品牌-品类】的数量-for召回【10->6】
+    public static final int maxVectorRNNSortBrandCount = 12;//截取【品牌-品类】的数量-for召回【10->6】
 
-    public static final int maxVectorW2SortBrandCount = 6;//截取【品牌-品类】的数量-for召回【10->6】
+    public static final int maxVectorW2SortBrandCount = 12;//截取【品牌-品类】的数量-for召回【10->6】
 
 
 }

@@ -16,9 +16,9 @@ public class SknCountConstants {
     public static final int NEW_SHOP = 5;//减少10->5
     public static final int ADD_FLOW = 10;
 
-    public static final int REC_SORT_BRAND_SKN_COUNT = 8;
-    public static final int VEC_SORT_BRAND_SKN_COUNT = 4;//8->4
+    public static final int REC_SORT_BRAND_SKN_COUNT = 6;
+    public static final int VEC_SORT_BRAND_SKN_COUNT = 6;
 
-    public static final int MAX_USER_RECALL_SKN_CACHE_COUNT = 200;
+    public static final int MAX_USER_RECALL_SKN_CACHE_COUNT = 300;
 
 }

@@ -173,6 +173,13 @@ public class ShopListServiceImpl implements IShopListService {
 				yohoShopIds.add(shopId);
 			}
 		}
+
+		//店铺搜索屏蔽【球鞋集市】
+		Integer qxjsShopId = 3504;
+		if(yohoShopIds.contains(qxjsShopId)){
+			yohoShopIds.remove(qxjsShopId);
+		}
+
 		// 获取有货状态为1的店铺
 		Map<String, Map<String, Object>> yohoShopMap = this.queryYohoValidShopMap(yohoShopIds);
 		Map<String, Map<String, Object>> globalBrandMap = this.queryGlobalValidMap(globalBrandIds);