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/ClerkApiService.java

@@ -122,4 +122,17 @@ public interface ClerkApiService {
      * @throws
      */
     ServiceResponse<Integer> addClerkToOtherStore(Integer clerkId, Integer storeId, Integer enterpriseId);
+
+    /**
+     * @Title: listClerkByStoreBrand
+     * @Description: 按店招品牌搜索所有导购
+     * @author zhiwj
+     * @param enterpriseId
+     * @param storeBrandId
+     * @param clerkName
+     * @return com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.store.dto.ClerkDTO>>
+     * @throws
+     */
+    ServiceResponse<List<ClerkDTO>> listClerkByStoreBrand(Integer enterpriseId, Integer storeBrandId, String clerkName);
+
 }

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

@@ -58,7 +58,7 @@ public interface TabClerkMapper {
 
     Integer countByPhoneNumber(@Param("storeId") Integer storeId, @Param("phoneNumber") String phoneNumber, @Param("clerkId") Integer clerkId);
 
-    List<TabClerk> listClerkByStoreInfoId(@Param("enterpriseId") Integer enterpriseId, @Param("storeClerkIds") List<Integer> storeClerkIds, @Param("search") String search);
+    List<TabClerk> listClerkByStoreInfoId(@Param("enterpriseId") Integer enterpriseId, @Param("storeClerkIds") List<Integer> storeClerkIds, @Param("storeInfoIds") String storeInfoIds, @Param("search") String search);
 
     Integer getTotalClerk(@Param("enterpriseId") Integer enterpriseId, @Param("storeClerkIds") List<Integer> storeClerkIds, @Param("search") String search);
 

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

@@ -74,12 +74,14 @@ public interface ClerkService {
      * @Description: 查询下导购列表
      * @author zhiwj 
      * @param enterpriseId 企业id
-     * @param storeIds 门店ids
+     * @param storeInfoIds 门店ids
      * @param search 查询条件:clerkName or clerkCode
      * @return java.util.List<com.gic.store.entity.TabClerk>
      * @throws 
      */
-    List<TabClerk> listClerkByStoreInfoId(Integer enterpriseId, List<Integer> storeIds, String search);
+    List<TabClerk> listClerkByStoreInfoId(Integer enterpriseId, List<Integer> storeInfoIds, String search);
+
+    List<TabClerk> listClerkByStoreInfoId(Integer enterpriseId, String storeInfoIds, String search);
 
     Integer getTotalClerk(Integer enterpriseId, List<Integer> storeInfoIds, String search);
     /**
@@ -109,7 +111,7 @@ public interface ClerkService {
 
     TabClerk getById(Integer clerkId);
 
-    List<TabClerk> listClerk(Integer enterpriseId, String search);
+    List<TabClerk> listClerkByStoreInfoId(Integer enterpriseId, String search);
 
     TabClerk getClerkByCode(Integer enterpriseId, String clerkCode, Integer storeInfoId);
 }

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

@@ -88,8 +88,13 @@ public class ClerkServiceImpl implements ClerkService {
     }
 
     @Override
-    public List<TabClerk> listClerkByStoreInfoId(Integer enterpriseId, List<Integer> storeInfoClerkIds, String search) {
-        return tabClerkMapper.listClerkByStoreInfoId(enterpriseId, storeInfoClerkIds, search);
+    public List<TabClerk> listClerkByStoreInfoId(Integer enterpriseId, List<Integer> storeInfoIds, String search) {
+        return tabClerkMapper.listClerkByStoreInfoId(enterpriseId, storeInfoIds, null, search);
+    }
+
+    @Override
+    public List<TabClerk> listClerkByStoreInfoId(Integer enterpriseId, String storeInfoIds, String search) {
+        return tabClerkMapper.listClerkByStoreInfoId(enterpriseId, null, storeInfoIds, search);
     }
 
     @Override
@@ -132,8 +137,8 @@ public class ClerkServiceImpl implements ClerkService {
     }
 
     @Override
-    public List<TabClerk> listClerk(Integer enterpriseId, String search) {
-        return this.tabClerkMapper.listClerkByStoreInfoId(enterpriseId, null, search);
+    public List<TabClerk> listClerkByStoreInfoId(Integer enterpriseId, String search) {
+        return this.tabClerkMapper.listClerkByStoreInfoId(enterpriseId, null, null, search);
     }
 
     @Override

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

@@ -329,7 +329,7 @@ public class ClerkApiServiceImpl implements ClerkApiService {
 
     @Override
     public ServiceResponse<List<ClerkDTO>> listClerk(Integer enterpriseId, String search) {
-        List<TabClerk> clerkList = this.clerkService.listClerk(enterpriseId, search);
+        List<TabClerk> clerkList = this.clerkService.listClerkByStoreInfoId(enterpriseId, search);
         return ServiceResponse.success(EntityUtil.changeEntityListByJSON(ClerkDTO.class, clerkList));
     }
 
@@ -446,6 +446,23 @@ public class ClerkApiServiceImpl implements ClerkApiService {
         }
     }
 
+    @Override
+    public ServiceResponse<List<ClerkDTO>> listClerkByStoreBrand(Integer enterpriseId, Integer storeBrandId, String clerkName) {
+        StoreSearchDBDTO storeSearchDBDTO = new StoreSearchDBDTO();
+        storeSearchDBDTO.setEnterpriseId(enterpriseId);
+        storeSearchDBDTO.setStoreBrandId(storeBrandId);
+        List<StoreDTO> list = this.storeService.listStore(storeSearchDBDTO, 1, 10000);
+        if (CollectionUtils.isEmpty(list)) {
+            return EnterpriseServiceResponse.failure(ErrorCode.NOTEXISTS);
+        }
+        // list 如果太大， 让 mybatis 解析 会打满内存
+        String storeInfoIds = list.stream().map(e -> e.getStoreInfoId().toString()).reduce((x, y) -> x + "," + y).get();
+        storeInfoIds = "(" + storeInfoIds + ")";
+        List<TabClerk> clerkList = this.clerkService.listClerkByStoreInfoId(enterpriseId, storeInfoIds, clerkName);
+        List<ClerkDTO> dtoList = EntityUtil.changeEntityListByJSON(ClerkDTO.class, clerkList);
+        return EnterpriseServiceResponse.success(dtoList);
+    }
+
     private static ServiceResponse<String> responseErrorElement(ImportClerkBatchResultEnum error) {
         logger.warn("批处理导购错误返回结果:{}", error.toString());
         return ServiceResponse.failure(error.getCode(), error.toString());

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

@@ -218,6 +218,9 @@
         #{item}
       </foreach>
     </if>
+    <if test="storeInfoIds != null ">
+        and store_info_id in ${storeInfoIds}
+    </if>
     <if test="search != null and search != '' ">
       and (clerk_code like concat('%', #{search} ,'%') or clerk_name like concat('%', #{search} ,'%') )
     </if>

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

@@ -384,7 +384,7 @@
       and t1.city_id= #{store.cityId}
     </if>
     <if test="store.storeBrandId != null">
-      and t1.brand_ids like concat('%,', #{store.storeBrandId}, ',%')
+      and t1.brand_ids like concat('%', #{store.storeBrandId}, '%')
     </if>
     <if test="store.storeGroupIdList != null and store.storeGroupIdList.size()>0">
       and t2.store_group_id in