搜索增加有货商品

@@ -57,7 +57,7 @@ public class ProductSearchController {
 			@RequestParam(value = "query", required = false)String query,
 			@RequestParam(value = "query", required = false)String query,
 			@RequestParam(value = "limit", required = false)Integer limit,
 			@RequestParam(value = "limit", required = false)Integer limit,
 			@RequestParam(value = "page", required = false)Integer page,
 			@RequestParam(value = "page", required = false)Integer page,
-			@RequestParam(value = "app_version", required = true)String appVersion
+			@RequestParam(value = "app_version", required = false)String appVersion
 	) {
 	) {
 		if (type != null) {
 		if (type != null) {
 			Map<Integer,Integer> poolConfig = ufoServiceCaller.call("ufo.resource.goodsPool", Map.class);
 			Map<Integer,Integer> poolConfig = ufoServiceCaller.call("ufo.resource.goodsPool", Map.class);
@@ -114,7 +114,8 @@ public class ProductSearchController {
 			@RequestParam(value = "gender", required = false) String gender,
 			@RequestParam(value = "gender", required = false) String gender,
 			@RequestParam(value = "size", required = false) String size,
 			@RequestParam(value = "size", required = false) String size,
 			@RequestParam(value = "isSoonSale", required = false) String isSoonSale,
 			@RequestParam(value = "isSoonSale", required = false) String isSoonSale,
-			@RequestParam(value = "query", required = false)String query
+			@RequestParam(value = "query", required = false)String query,
+			@RequestParam(value = "app_version", required = false)String appVersion
 	) {
 	) {
 
 
 
 
@@ -122,6 +123,7 @@ public class ProductSearchController {
 		ProductSearchReq req = new ProductSearchReq().setPool(productPool).setBrand(brand).setMidSort(sortIdLevel.getMidSortId()).setMaxSort(sortIdLevel.getMaxSortId())
 		ProductSearchReq req = new ProductSearchReq().setPool(productPool).setBrand(brand).setMidSort(sortIdLevel.getMidSortId()).setMaxSort(sortIdLevel.getMaxSortId())
 				.setSeries(series).setGender(gender).setSize(size).setIsSoonSale(isSoonSale);
 				.setSeries(series).setGender(gender).setSize(size).setIsSoonSale(isSoonSale);
 		searchHelpService.setQuery(query, req);
 		searchHelpService.setQuery(query, req);
+		searchHelpService.setContainYoho(appVersion, req);
 		LOG.info("in method=ufo.product.search.list req={}", req.toString());
 		LOG.info("in method=ufo.product.search.list req={}", req.toString());
 
 
 		SearchProductListFilterResp resp = productSearchService.searchProductListFilter(req);
 		SearchProductListFilterResp resp = productSearchService.searchProductListFilter(req);

@@ -64,7 +64,8 @@ public class SearchParam {
                 .setProductPool(req.getPool()).setBrandSeries(req.getSeries()).setGender(req.getGender()).setNotId(req.getNot_id())
                 .setProductPool(req.getPool()).setBrandSeries(req.getSeries()).setGender(req.getGender()).setNotId(req.getNot_id())
                 .setFilterYearMonth(req.getFilterYearMonth())
                 .setFilterYearMonth(req.getFilterYearMonth())
 		        .setStartTime(req.getStartTime())
 		        .setStartTime(req.getStartTime())
-		        .setEndTime(req.getEndTime());
+		        .setEndTime(req.getEndTime())
+		        .setContainYoho(req.getContainYoho());
         return this;
         return this;
     }
     }