Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer

gic-store-api/src/main/java/com/gic/store/service/StoreBrandApiService.java

@@ -112,6 +112,13 @@ public interface StoreBrandApiService {
     ServiceResponse<List<StoreBrandDTO>> listStoreBrandByIds(List<Integer> brandIdList);
 
     /**
+     * 查询所有的信息，包括商户关联信息
+     * @param brandIdList
+     * @return
+     */
+    ServiceResponse<List<StoreBrandDTO>> listAllStoreBrandInfoByIds(List<Integer> brandIdList);
+
+    /**
      * 查详情
      * @Title: getById
      * @Description:

gic-store-service/src/main/java/com/gic/store/dao/mapper/TabStoreBrandMapper.java

@@ -124,6 +124,13 @@ public interface TabStoreBrandMapper {
     List<TabStoreBrand> listStoreBrandByIds(@Param("ids") List<Integer> idList);
 
     /**
+     * 查询品牌
+     * @param brandIdList
+     * @return
+     */
+    List<TabStoreBrand> listAllStoreBrandInfoByIds(@Param("ids") List<Integer> brandIdList);
+
+    /**
      * getByStoreBrandName
      * @Title: getByStoreBrandName
      * @Description:

gic-store-service/src/main/java/com/gic/store/service/StoreBrandService.java

@@ -219,6 +219,13 @@ public interface StoreBrandService {
     List<TabStoreBrand> listStoreBrandByIds(List<Integer> brandIdList);
 
     /**
+     * 查询品牌信息
+     * @param brandIdList
+     * @return
+     */
+    List<TabStoreBrand> listAllStoreBrandInfoByIds(List<Integer> brandIdList);
+
+    /**
      * getById
      * @Title: getById
      * @Description:

gic-store-service/src/main/java/com/gic/store/service/impl/StoreBrandServiceImpl.java

@@ -237,6 +237,14 @@ public class StoreBrandServiceImpl implements StoreBrandService {
     }
 
     @Override
+    public List<TabStoreBrand> listAllStoreBrandInfoByIds(List<Integer> brandIdList) {
+        if (CollectionUtils.isNotEmpty(brandIdList)) {
+            return tabStoreBrandMapper.listAllStoreBrandInfoByIds(brandIdList);
+        }
+        return null;
+    }
+
+    @Override
     public TabStoreBrand getById(Integer storeBrandId) {
         return tabStoreBrandMapper.selectByPrimaryKey(storeBrandId);
     }

gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreBrandApiServiceImpl.java

@@ -173,6 +173,11 @@ public class StoreBrandApiServiceImpl implements StoreBrandApiService {
     }
 
     @Override
+    public ServiceResponse<List<StoreBrandDTO>> listAllStoreBrandInfoByIds(List<Integer> brandIdList) {
+        return ServiceResponse.success(EntityUtil.changeEntityListNew(StoreBrandDTO.class, storeBrandService.listAllStoreBrandInfoByIds(brandIdList)));
+    }
+
+    @Override
     public ServiceResponse<StoreBrandDTO> getById(Integer storeBrandId) {
         TabStoreBrand storeBrand = this.storeBrandService.getById(storeBrandId);
         return ServiceResponse.success(EntityUtil.changeEntityByJSON(StoreBrandDTO.class, storeBrand));

gic-store-service/src/main/resources/mapper/TabStoreBrandMapper.xml

@@ -236,6 +236,19 @@
     </if>
     order by t1.store_brand_id
   </select>
+
+  <select id="listAllStoreBrandInfoByIds" resultMap="BaseResultMap">
+    select <include refid="Ref_Column_List" />
+    from tab_store_brand t1, tab_store_brand_ref t2
+    where t2.delete_flag = 0 and t1.delete_flag =0 and t1.store_brand_id = t2.store_brand_id
+    <if test="null != ids and ids.size() &gt; 0">
+      and t1.store_brand_id in
+      <foreach close=")" collection="ids" index="index" item="item" open="(" separator=",">
+        #{item}
+      </foreach>
+    </if>
+  </select>
+
   <select id="getByStoreBrandName" resultMap="BaseResultMap">
     select
     <include refid="Ref_Column_List" />