yoho-search / yoho-search-service · Commits

Go to a project

Authored by hugufei
Commit 25cc6b1d780bc4b2f8cf5aa2d1e4e046750c456e 1 parent c6dc6835

去除0元助力商品的显示限制

Inline Side-by-side
Showing 5 changed files with 5 additions and 11 deletions
@@ -28,7 +28,6 @@ public class BaseSceneService { @@ -28,7 +28,6 @@ public class BaseSceneService {
28 paramMap.put(SearchRequestParams.PARAM_SEARCH_ATTRIBUTE_NOT, "2");// 非赠品 28 paramMap.put(SearchRequestParams.PARAM_SEARCH_ATTRIBUTE_NOT, "2");// 非赠品
29 paramMap.put(SearchRequestParams.PARAM_SEARCH_NEEDSMALLSORT, "1");// 品类聚合时带上小分类 29 paramMap.put(SearchRequestParams.PARAM_SEARCH_NEEDSMALLSORT, "1");// 品类聚合时带上小分类
30 paramMap.put(SearchRequestParams.PARAM_SEARCH_AGG_WITH_PARAM_BRAND, "Y");// 聚合时使用参数中自带的参数 30 paramMap.put(SearchRequestParams.PARAM_SEARCH_AGG_WITH_PARAM_BRAND, "Y");// 聚合时使用参数中自带的参数
31 - paramMap.put(SearchRequestParams.PARAM_SEARCH_CONTAIN_ZEROHELP, "N");// 不支持0元助力  
32 // 关键词反转码 31 // 关键词反转码
33 String keyword = SearchKeyWordUtils.getParamKeyword(paramMap, SearchRequestParams.PARAM_SEARCH_QUERY);// 转码 32 String keyword = SearchKeyWordUtils.getParamKeyword(paramMap, SearchRequestParams.PARAM_SEARCH_QUERY);// 转码
34 if (!StringUtils.isBlank(keyword)) { 33 if (!StringUtils.isBlank(keyword)) {
@@ -52,7 +51,6 @@ public class BaseSceneService { @@ -52,7 +51,6 @@ public class BaseSceneService {
52 paramMap.put(SearchRequestParams.PARAM_SEARCH_ISLIMITEDBUY, "N");// 不支持限购 51 paramMap.put(SearchRequestParams.PARAM_SEARCH_ISLIMITEDBUY, "N");// 不支持限购
53 paramMap.put(SearchRequestParams.PARAM_SEARCH_ISDESPOSITADVANCE, "N");// 不支持定金预售 52 paramMap.put(SearchRequestParams.PARAM_SEARCH_ISDESPOSITADVANCE, "N");// 不支持定金预售
54 paramMap.put(SearchRequestParams.PARAM_SEARCH_ISLIMITTIMEADVANCE, "N");// 不支持定金促销 53 paramMap.put(SearchRequestParams.PARAM_SEARCH_ISLIMITTIMEADVANCE, "N");// 不支持定金促销
55 - paramMap.put(SearchRequestParams.PARAM_SEARCH_CONTAIN_ZEROHELP, "N");// 不支持0元助力  
56 } 54 }
57 55
58 protected int getPage(Map<String, String> paramMap) { 56 protected int getPage(Map<String, String> paramMap) {
@@ -111,7 +111,7 @@ public class SearchRequestParams { @@ -111,7 +111,7 @@ public class SearchRequestParams {
111 public static final String PARAM_SEARCH_IS_GLOBAL = "is_global"; // 是否只看全球购【y/n】 111 public static final String PARAM_SEARCH_IS_GLOBAL = "is_global"; // 是否只看全球购【y/n】
112 public static final String PARAM_SEARCH_CONTAIN_SECKILL = "contain_seckill"; // 是否包含秒杀[y] 112 public static final String PARAM_SEARCH_CONTAIN_SECKILL = "contain_seckill"; // 是否包含秒杀[y]
113 public static final String PARAM_SEARCH_CONTAIN_FOBBIDEN = "contain_fobbiden"; // 是否包含秒杀[y] 113 public static final String PARAM_SEARCH_CONTAIN_FOBBIDEN = "contain_fobbiden"; // 是否包含秒杀[y]
114 - public static final String PARAM_SEARCH_CONTAIN_ZEROHELP = "contain_zerohelp"; // 是否包含0元助力[y] 114 + //public static final String PARAM_SEARCH_CONTAIN_ZEROHELP = "contain_zerohelp"; // 是否包含0元助力[y]
115 public static final String PARAM_SEARCH_USER_VIP_LEVEL = "userVipLevel";// 用户VIP等级 115 public static final String PARAM_SEARCH_USER_VIP_LEVEL = "userVipLevel";// 用户VIP等级
116 116
117 //not 参数 117 //not 参数
@@ -335,11 +335,6 @@ public class SearchQueryHelper { @@ -335,11 +335,6 @@ public class SearchQueryHelper {
335 boolFilter.mustNot(QueryBuilders.termQuery(ProductIndexEsField.isSeckill, "Y")); 335 boolFilter.mustNot(QueryBuilders.termQuery(ProductIndexEsField.isSeckill, "Y"));
336 } 336 }
337 337
338 - // 如果contain_zerohelp！=Y，则过滤掉0元助力商品  
339 - if (!MapUtils.getString(paramMap, SearchRequestParams.PARAM_SEARCH_CONTAIN_ZEROHELP, "N").equalsIgnoreCase("Y")) {  
340 - boolFilter.mustNot(QueryBuilders.termQuery(ProductIndexEsField.isZeroHelp, "Y"));  
341 - }  
342 -  
343 // 如果contain_fobbiden！=Y，则过滤屏蔽的商品 338 // 如果contain_fobbiden！=Y，则过滤屏蔽的商品
344 if (!MapUtils.getString(paramMap, SearchRequestParams.PARAM_SEARCH_CONTAIN_FOBBIDEN, "N").equalsIgnoreCase("Y")) { 339 if (!MapUtils.getString(paramMap, SearchRequestParams.PARAM_SEARCH_CONTAIN_FOBBIDEN, "N").equalsIgnoreCase("Y")) {
345 boolFilter.mustNot(QueryBuilders.termQuery(ProductIndexEsField.isFobbiden, 1)); 340 boolFilter.mustNot(QueryBuilders.termQuery(ProductIndexEsField.isFobbiden, 1));
@@ -55,7 +55,6 @@ public class MiniappFuzzyPageSceneService extends AbstractPageSceneService { @@ -55,7 +55,6 @@ public class MiniappFuzzyPageSceneService extends AbstractPageSceneService {
55 paramMap.put(SearchRequestParams.PARAM_SEARCH_CONTAIN_GLOBAL, "N");// 不支持全球购 55 paramMap.put(SearchRequestParams.PARAM_SEARCH_CONTAIN_GLOBAL, "N");// 不支持全球购
56 paramMap.put(SearchRequestParams.PARAM_SEARCH_CONTAIN_UFO, "N");// 不支持UFO 56 paramMap.put(SearchRequestParams.PARAM_SEARCH_CONTAIN_UFO, "N");// 不支持UFO
57 paramMap.put(SearchRequestParams.PARAM_SEARCH_BUNDLETYPE, "0");// 不支持套餐 57 paramMap.put(SearchRequestParams.PARAM_SEARCH_BUNDLETYPE, "0");// 不支持套餐
58 - paramMap.put(SearchRequestParams.PARAM_SEARCH_CONTAIN_ZEROHELP, "N");// 不支持0元助力  
59 58
60 } 59 }
61 60
@@ -2,7 +2,10 @@ package com.yoho.search.service.scene.pages; @@ -2,7 +2,10 @@ package com.yoho.search.service.scene.pages;
2 2
3 import com.alibaba.fastjson.JSON; 3 import com.alibaba.fastjson.JSON;
4 import com.alibaba.fastjson.JSONObject; 4 import com.alibaba.fastjson.JSONObject;
5 -import com.yoho.search.base.utils.*; 5 +import com.yoho.search.base.utils.DateUtil;
  6 +import com.yoho.search.base.utils.ISearchConstants;
  7 +import com.yoho.search.base.utils.ProductIndexEsField;
  8 +import com.yoho.search.base.utils.SearchPageIdDefine;
6 import com.yoho.search.common.SearchCommonService; 9 import com.yoho.search.common.SearchCommonService;
7 import com.yoho.search.common.SearchRequestParams; 10 import com.yoho.search.common.SearchRequestParams;
8 import com.yoho.search.common.utils.SearchApiResultUtils; 11 import com.yoho.search.common.utils.SearchApiResultUtils;
@@ -177,7 +180,6 @@ public class ZeroHelpProductPageSceneService extends AbstractPageSceneService { @@ -177,7 +180,6 @@ public class ZeroHelpProductPageSceneService extends AbstractPageSceneService {
177 180
178 @Override 181 @Override
179 public void addParamsToParamMap(Map<String, String> paramMap) { 182 public void addParamsToParamMap(Map<String, String> paramMap) {
180 - paramMap.put(SearchRequestParams.PARAM_SEARCH_CONTAIN_ZEROHELP, "Y");// 0元助力  
181 paramMap.put(SearchRequestParams.PARAM_SEARCH_STATUS, "1");// 上架 183 paramMap.put(SearchRequestParams.PARAM_SEARCH_STATUS, "1");// 上架
182 paramMap.put(SearchRequestParams.PARAM_SEARCH_STOCKNUM, "1");// 有库存 184 paramMap.put(SearchRequestParams.PARAM_SEARCH_STOCKNUM, "1");// 有库存
183 paramMap.put(SearchRequestParams.PARAM_SEARCH_CONTAIN_FOBBIDEN, "Y");// 可以显示屏蔽商品 185 paramMap.put(SearchRequestParams.PARAM_SEARCH_CONTAIN_FOBBIDEN, "Y");// 可以显示屏蔽商品