Merge remote-tracking branch 'origin/developer' into developer

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/service/PlatformBrandApiService.java

@@ -61,6 +61,16 @@ public interface PlatformBrandApiService {
     ServiceResponse<Page<PlatformBrandDTO>> listPlatformBrand(PlatformBrandDTO platformBrandDTO, Integer pageNum, Integer pageSize);
 
     /**
+     * @Title: listPlatformBrand
+     * @Description:
+     * @author zhiwj 
+     * @param brandName 平台品牌name
+     * @return com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.enterprise.dto.PlatformBrandDTO>>
+     * @throws
+     */
+    ServiceResponse<List<PlatformBrandDTO>> listPlatformBrand(String brandName);
+
+    /**
      * 添加商户品牌和平台品牌的关联关系
      * @Title: addRef
      * @Description: 添加商户品牌和平台品牌的关联关系

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/PlatformBrandApiServiceImpl.java

@@ -121,6 +121,15 @@ public class PlatformBrandApiServiceImpl implements PlatformBrandApiService {
     }
 
     @Override
+    public ServiceResponse<List<PlatformBrandDTO>> listPlatformBrand(String brandName) {
+        PlatformBrandDTO platformBrandDTO = new PlatformBrandDTO();
+        platformBrandDTO.setPlatformBrandName(brandName);
+        com.github.pagehelper.Page<TabPlatformBrand> storeBrandList = platformBrandService.listPlatformBrand(platformBrandDTO, 1, 10);
+        List<PlatformBrandDTO> list = EntityUtil.changeEntityListNew(PlatformBrandDTO.class, storeBrandList);
+        return ServiceResponse.success(list);
+    }
+
+    @Override
     public ServiceResponse<Integer> addRef(Integer enterpriseId, Integer enterpriseBrandId, String enterpriseBrandName, String enterpriseBrandCode, String categoryCode) {
         // 先判断后执行 可能并发
         TabPlatformBrand platformBrand = platformBrandService.getByBrandName(enterpriseBrandName);