Authored by tanling

Merge branch 'test6.9.12' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.12

... ... @@ -330,7 +330,7 @@ public class ProductSearchController {
}
@ApiOperation(name = "ufo.product.search.appraise.list", desc="首页商品推荐")
@RequestMapping(params = "method=ufo.product.appraise.list")
@RequestMapping(params = "method=ufo.product.search.appraise.list")
@IgnoreSession
@Cachable(expire = 180)
public ApiResponse searchAppraiseProductList(
... ...
... ... @@ -187,7 +187,7 @@ public class ProductSearchServiceImpl implements ProductSearchService {
@Override
public JSONObject searchAppraiseProductList(ProductSearchReq req) {
req.setNotBrand(StringUtils.join(brandMapper.selectExcludeAppraise(), ","))
req.setNotBrand(StringUtils.join(brandMapper.selectExcludeAppraise(), ","));
SearchParam searchParam = new SearchParam().buildPageSearchParam(req);
String url = PRODUCT_SEARCH_QUERY_URL;
JSONObject data = search(searchParam.getParam(), url);
... ...