导购gic门店和好办企业门店交集

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/StaffApiService.java

@@ -235,6 +235,16 @@ public interface StaffApiService {
      */
     List<String> getHaoBanStoreIdsRolesByClerkId(String clerkId, String wxEnterpriseId);
 
+    /**
+     * 导购gic门店和好办企业门店交集
+     * @param clerkId
+     * @param wxEnterpriseId
+     * @param storeStatusList 门店状态筛选： 状态（0：无效，2：上线，3：未上线，-3：回收站 ， 4占坑 ，6:停业整顿），7待上线
+     * @param isMustReturnStoreIdWhenSuperAdmin false:全部门店权限则返回为空 true：必返回门店id
+     * @return
+     */
+    List<String> getHaobanStoreIdsRolesByClerkIdAndStoreStatus(String clerkId, String wxEnterpriseId, List<String> storeStatusList, boolean isMustReturnStoreIdWhenSuperAdmin);
+
     List<String> isGicSuper(String clerkId , String wxEnterpriseId) ;
 
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java

@@ -901,6 +901,47 @@ public class StaffApiServiceImpl implements StaffApiService {
     }
 
     @Override
+    public List<String> getHaobanStoreIdsRolesByClerkIdAndStoreStatus(String clerkId, String wxEnterpriseId, List<String> storeStatusList, boolean isMustReturnStoreIdWhenSuperAdmin) {
+        boolean hasStoreStatusFilter = CollectionUtils.isNotEmpty(storeStatusList);
+
+        List<String> storeIds = getHaoBanStoreIdsRolesByClerkId(clerkId, wxEnterpriseId);
+        if (CollectionUtils.isEmpty(storeIds)) {
+            //无权限
+            return Collections.singletonList("no_store");
+        }
+        boolean isSuperAdminStore = storeIds.size() == 1 && StringUtils.equals(storeIds.get(0), "-1");
+        if (isSuperAdminStore) {
+            //所有权限
+            if (!hasStoreStatusFilter && !isMustReturnStoreIdWhenSuperAdmin) {
+                return Collections.emptyList();
+            }
+        }
+        if (!hasStoreStatusFilter) {
+            return storeIds;
+        }
+        ClerkDTO clerkDTO = clerkService.getClerkByClerkId(clerkId);
+        StoreSearchDTO storeSearchDTO = new StoreSearchDTO() ;
+        storeSearchDTO.setEnterpriseId(clerkDTO.getEnterpriseId());
+        if (isSuperAdminStore) {
+            storeSearchDTO.setStatusIn("-3");
+        }
+        if (!isSuperAdminStore) {
+            storeSearchDTO.setAuthStoreIdList(storeIds);
+        }
+        if (CollectionUtils.isNotEmpty(storeStatusList)) {
+            storeSearchDTO.setStatusAnyIn(storeStatusList);
+        }
+        List<String> resultList = storeService.listStoreIds(storeSearchDTO);
+        if (isSuperAdminStore) {
+            if (storeStatusList.contains("2")) {
+                //所有门店权限，且选择了上线门店状态，则添加无归属门店id
+                resultList.add("-1");
+            }
+        }
+        return resultList;
+    }
+
+    @Override
     public List<String> getHaoBanStoreIdsRolesByClerkId(String clerkId, String wxEnterpriseId) {
         logger.info("查询导购权限，clerkId={},wxEnterpriseId={}", clerkId, wxEnterpriseId);
         if (StringUtils.isAnyBlank(clerkId, wxEnterpriseId)) {