yoho-search / yoho-search-service · Commits

Go to a project

Authored by 胡古飞
Commit 155b1b187cfbfe2eba33c06aa68f5ffb9ba20ca1 1 parent b979f42b

是否包含全球购，由API那边控制

Inline Side-by-side
Showing 3 changed files with 1 additions and 17 deletions
@@ -139,7 +139,6 @@ public class BrandController { @@ -139,7 +139,6 @@ public class BrandController {
139 @ResponseBody 139 @ResponseBody
140 public SearchApiResult brandsWithShops(HttpServletRequest request) { 140 public SearchApiResult brandsWithShops(HttpServletRequest request) {
141 Map<String, String> paramMap = HttpServletRequestUtils.transParamType(request); 141 Map<String, String> paramMap = HttpServletRequestUtils.transParamType(request);
142 - paramMap.put("can_contain_global", "Y");  
143 return brandWithShopsService.brandsWithShops(paramMap); 142 return brandWithShopsService.brandsWithShops(paramMap);
144 } 143 }
145 } 144 }
@@ -30,10 +30,9 @@ public class ProductListController { @@ -30,10 +30,9 @@ public class ProductListController {
30 @ResponseBody 30 @ResponseBody
31 public SearchApiResult productList(HttpServletRequest request) { 31 public SearchApiResult productList(HttpServletRequest request) {
32 Map<String, String> paramMap = HttpServletRequestUtils.transParamType(request); 32 Map<String, String> paramMap = HttpServletRequestUtils.transParamType(request);
33 - paramMap.put("can_contain_global", "Y");// 加个参数，表明该接口可以返回全球购  
34 return productListService.productList(paramMap); 33 return productListService.productList(paramMap);
35 } 34 }
36 - 35 +
37 /** 36 /**
38 * 获取商品列表 37 * 获取商品列表
39 * 38 *
@@ -63,7 +62,6 @@ public class ProductListController { @@ -63,7 +62,6 @@ public class ProductListController {
63 @ResponseBody 62 @ResponseBody
64 public SearchApiResult getESDsl(HttpServletRequest request) { 63 public SearchApiResult getESDsl(HttpServletRequest request) {
65 Map<String, String> paramMap = HttpServletRequestUtils.transParamType(request); 64 Map<String, String> paramMap = HttpServletRequestUtils.transParamType(request);
66 - paramMap.put("isProductList", "Y");// 加个参数，表明是商品列表  
67 return productListService.getESDsl(paramMap); 65 return productListService.getESDsl(paramMap);
68 } 66 }
69 67
@@ -117,19 +117,6 @@ public class SearchCommonHelper { @@ -117,19 +117,6 @@ public class SearchCommonHelper {
117 if (!paramMap.containsKey("contain_global") || !"Y".equals(paramMap.get("contain_global"))) { 117 if (!paramMap.containsKey("contain_global") || !"Y".equals(paramMap.get("contain_global"))) {
118 return false; 118 return false;
119 } 119 }
120 - // 3、判断是否查询skn  
121 - String keyword = paramMap.get("query");  
122 -// if (StringUtils.isBlank(keyword)) {  
123 -// return false;  
124 -// }  
125 - // 4、如果是查询skn，则也不包含全球购  
126 - // if (isQuerySkn(keyword)) {  
127 - // return false;  
128 - // }  
129 - // 5、只有调列表并且是模糊搜索的时候，才为true  
130 - if (paramMap.containsKey("can_contain_global")) {  
131 - return true;  
132 - }  
133 return false; 120 return false;
134 } 121 }
135 122