新增 品牌搜索接口

src/main/java/com/uas/platform/b2c/prod/product/brand/api/BrandController.java

@@ -69,11 +69,11 @@ public class BrandController {
 	 * 分页获取按字符串获取以此字符为首字母的品牌信息
 	 * @return map（首字母，超简易品牌信息）
 	 */
-	@RequestMapping(value = "/initial/first/{keyword}", method = RequestMethod.GET)
-	public Page<BrandMostSimpleInfo> getInitialSimpleInfoByFirst(@PathVariable String keyword ,PageParams page) {
-		if (StringUtils.isEmpty(keyword))
+	@RequestMapping(value = "/initial/first/{key}", method = RequestMethod.GET)
+	public Page<Brand> getInitialSimpleInfoByFirst(@PathVariable String key ,PageParams page , String keyword) {
+		if (StringUtils.isEmpty(key))
 			keyword = "A";
-		return brandService.getInitialSimpleInfoByFirst(keyword,page);
+		return brandService.getInitialSimpleInfoByFirst(key,page,keyword);
 	}
 
 	/**

src/main/java/com/uas/platform/b2c/prod/product/brand/dao/BrandDao.java

@@ -2,6 +2,9 @@ package com.uas.platform.b2c.prod.product.brand.dao;
 
 import java.util.List;
 
+import com.uas.platform.b2c.prod.product.brand.modal.BrandMostSimpleInfo;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
@@ -67,4 +70,12 @@ public interface BrandDao extends JpaSpecificationExecutor<Brand>, JpaRepository
 	 */
 	@Query("select b from Brand b where upper(b.nameCn)=upper(:nameCn)")
 	public List<Brand> findByUpperNameCn(@Param("nameCn") String nameCn);
+
+	/**
+	 * 分页根据首字母获取品牌信息
+	 * @param initals
+	 * @return
+	 */
+	@Query(value = "select b from Brand b  where b.inital in :initals and b.nameEn like :key")
+	public Page<Brand> findInInitalsPage(@Param("initals") String[] initals ,@Param("key") String keyword, Pageable pageable);
 }

src/main/java/com/uas/platform/b2c/prod/product/brand/service/BrandService.java

@@ -60,7 +60,7 @@ public interface BrandService {
 	 * @param keyword 关键词
 	 * @return 品牌简易信息
 	 */
-	public Page<BrandMostSimpleInfo> getInitialSimpleInfoByFirst(String keyword , PageParams params);
+	public Page<Brand> getInitialSimpleInfoByFirst(String key , PageParams params, String keyword);
 
 	/**
 	 * 获取BrandInfo分页数据

src/main/java/com/uas/platform/b2c/prod/product/brand/service/impl/BrandServiceImpl.java

@@ -120,9 +120,9 @@ public class BrandServiceImpl implements BrandService {
 	}
 
 	@Override
-	public Page<BrandMostSimpleInfo> getInitialSimpleInfoByFirst(String keyword , PageParams params) {
+	public Page<Brand> getInitialSimpleInfoByFirst(String key , PageParams params ,String keyword) {
 		Pageable pageable = new PageInfo(params);
-		return brandMostSimpleInfoDao.findInInitalsPage(new String[]{keyword},pageable);
+		return brandDao.findInInitalsPage(new String[]{key},keyword, pageable);
 	}
 
 	// 判断一个字符串是否含有中文