Merge branch 'master' into zf_suggest_mgr

# Conflicts:
#	service/src/main/java/com/yoho/search/service/service/helper/SearchCommonHelper.java

@@ -2,6 +2,7 @@ package com.yoho.search.service.service.helper;
 
 import com.yoho.search.base.utils.CharUtils;
 import com.yoho.search.base.utils.ISearchConstants;
+import com.yoho.search.base.utils.SearchPageIdDefine;
 import com.yoho.search.service.service.SearchDynamicConfigService;
 import com.yoho.search.service.utils.SearchRequestParams;
 import org.apache.commons.lang.StringUtils;
@@ -228,7 +229,7 @@ public class SearchCommonHelper {
 	 */
 	public boolean isNewRecPage(Map<String, String> paramMap) {
 		String pageId = paramMap.get("pageId");
-		if (StringUtils.isBlank(pageId) || !pageId.equals("4")) {
+		if (StringUtils.isBlank(pageId) || !pageId.equals(SearchPageIdDefine.PAGE_ID_NEW)) {
 			return false;
 		}
 		return true;

@@ -200,10 +200,13 @@ public class SearchServiceHelper {
 		}
 
 		// 全局降分品牌过滤
-		if ("Y".equals(paramMap.get(SearchRequestParams.PARAM_SEARCH_GLOBAL_FILTER_BRAND))) {
-			boolFilter.mustNot(QueryBuilders.termQuery("isForbiddenSortBrand", 1));
+//		if ("Y".equals(paramMap.get(SearchRequestParams.PARAM_SEARCH_GLOBAL_FILTER_BRAND))) {
+//			boolFilter.mustNot(QueryBuilders.termQuery("isForbiddenSortBrand", 1));
+//		}
+		if ("Y".equals(paramMap.get(SearchRequestParams.PARAM_SEARCH_GLOBAL_FILTER_BRAND)) && StringUtils.isNotBlank(paramMap.get("pageId"))){
+			boolFilter.mustNot(QueryBuilders.termQuery("forbiddenPageIds",paramMap.get("pageId")));
 		}
-
+		
 		// 店铺
 		if (paramMap.containsKey(SearchRequestParams.PARAM_SEARCH_SHOP) && StringUtils.isNotBlank(paramMap.get(SearchRequestParams.PARAM_SEARCH_SHOP))
 				&& !SearchRequestParams.PARAM_SEARCH_SHOP.equals(filterParamName)) {