Merge branch '0110' of http://git.yoho.cn/yoho-search/yoho-search-service into 0110

@@ -10,26 +10,26 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.yoho.search.service.servicenew.INewPromotionService;
+import com.yoho.search.service.servicenew.IAggProductListService;
 import com.yoho.search.service.utils.HttpServletRequestUtils;
 import com.yoho.search.service.vo.SearchApiResult;
 
 @Controller
-public class NewPromotionController {
+public class AggProductListController {
 
 	@Autowired
-	private INewPromotionService newPromotionService;
+	private IAggProductListService aggProductListService;
 
 	/**
-	 * 聚合商品列表
+	 * 聚合商品列表[按品牌或品类聚合]
 	 * 
 	 * @return
 	 */
-	@RequestMapping(method = RequestMethod.GET, value = "/newpromotion/aggProductList")
+	@RequestMapping(method = RequestMethod.GET, value = "/productindex/aggProductList")
 	@ResponseBody
-	public SearchApiResult productList(HttpServletRequest request) {
+	public SearchApiResult aggProductList(HttpServletRequest request) {
 		Map<String, String> paramMap = HttpServletRequestUtils.transParamType(request);
-		return newPromotionService.aggProductList(paramMap);
+		return aggProductListService.aggProductList(paramMap);
 	}
 
 }

@@ -4,7 +4,7 @@ import java.util.Map;
 
 import com.yoho.search.service.vo.SearchApiResult;
 
-public interface INewPromotionService {
+public interface IAggProductListService {
 
 	/**
 	 * 按品类或品牌聚合促销商品列表

@@ -41,12 +41,12 @@ import com.yoho.search.service.service.SearchCommonService;
 import com.yoho.search.service.service.helper.SearchCommonHelper;
 import com.yoho.search.service.service.helper.SearchServiceHelper;
 import com.yoho.search.service.service.helper.SearchSortHelper;
-import com.yoho.search.service.servicenew.INewPromotionService;
+import com.yoho.search.service.servicenew.IAggProductListService;
 import com.yoho.search.service.utils.SearchApiResultUtils;
 import com.yoho.search.service.vo.SearchApiResult;
 
 @Service
-public class NewPromotionServiceImpl implements INewPromotionService,ApplicationEventPublisherAware {
+public class AggProductListServiceImpl implements IAggProductListService,ApplicationEventPublisherAware {
 
 	private static final Logger logger = LoggerFactory.getLogger(ProductListServiceImpl.class);