新增管理员权限门店数据

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

@@ -126,6 +126,13 @@ public interface StoreApiService {
     ServiceResponse<Page<StoreDTO>> listStore(StoreSearchDTO storeSearchDTO, Integer pageNum, Integer pageSize);
 
     /**
+     * 管理员的权限门店数据
+     * @param userId
+     * @return
+     */
+    ServiceResponse<List<StoreDTO>> listStore(Integer userId);
+
+    /**
      * 按id查询门店图片  key：storeId    value:门店图片列表
      * @Title: listStorePhotoByIds
      * @Description:

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

@@ -5,6 +5,13 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
+import com.gic.auth.dto.ResourceGroupDTO;
+import com.gic.auth.dto.StoreResourceDTO;
+import com.gic.auth.dto.UserDTO;
+import com.gic.auth.dto.UserResourceDTO;
+import com.gic.auth.service.ResourceGroupApiService;
+import com.gic.auth.service.UserApiService;
+import com.gic.auth.service.UserResourceApiService;
 import com.gic.commons.util.*;
 import com.gic.enterprise.dto.CustomStoreDTO;
 import com.gic.enterprise.dto.EnterpriseDTO;
@@ -120,6 +127,12 @@ public class StoreApiServiceImpl implements StoreApiService {
     private WmStoreSyncLogApiService wmStoreSyncLogApiService;
     @Autowired
     private SparkJobApiService sparkJobApiService;
+    @Autowired
+    private ResourceGroupApiService resourceGroupApiService;
+    @Autowired
+    private UserApiService userApiService;
+    @Autowired
+    private UserResourceApiService userResourceApiService;
 
     private Map<String, BulkUpdateStoreStrtegy> storeStrtegyMap = new ConcurrentHashMap<>();
 
@@ -663,6 +676,37 @@ public class StoreApiServiceImpl implements StoreApiService {
     }
 
     @Override
+    public ServiceResponse<List<StoreDTO>> listStore(Integer userId) {
+        logger.info("查询管理员的权限门店数据参数:{}", userId);
+        ServiceResponse<UserDTO> userResponse = userApiService.getUserInfoById(userId);
+        if (userResponse.isSuccess()) {
+            UserDTO user = userResponse.getResult();
+            //组装门店查询条件
+            StoreSearchDTO dto = new StoreSearchDTO();
+            dto.setEnterpriseId(user.getEnterpriseId());
+
+            if (user.getSuperAdmin() != 1) {
+                //子管理员查询资源组配置门店资源信息
+                ServiceResponse<ResourceGroupDTO> resourceResponse = userResourceApiService.getResourceGroupByUserId(userId);
+                if (resourceResponse.isSuccess()) {
+                    ResourceGroupDTO resourceGroupDTO = resourceResponse.getResult();
+                    dto.setStoreResource(resourceGroupDTO.getStoreResource());
+                }
+            }
+            //查询门店
+            ServiceResponse<Page<StoreDTO>> storeResponse = listStore(dto, 1, 10000);
+            if (storeResponse.isSuccess()) {
+                Page<StoreDTO> page = storeResponse.getResult();
+                if (page != null) {
+                    return ServiceResponse.success(page.getResult());
+                }
+            }
+            return ServiceResponse.failure(storeResponse.getCode(), storeResponse.getMessage());
+        }
+        return ServiceResponse.failure(userResponse.getCode(), userResponse.getMessage());
+    }
+
+    @Override
     public ServiceResponse<Map<Integer, List<String>>> listStorePhotoByStoreIds(Integer enterpriseId, List<Integer> storeIdList) {
         StoreSearchDTO storeSearchDTO = new StoreSearchDTO();
         storeSearchDTO.setEnterpriseId(enterpriseId);

gic-store-web/src/main/java/com/gic/store/web/controller/StoreController.java

@@ -25,7 +25,7 @@ import com.gic.log.api.service.LogApiService;
 import com.gic.member.api.dto.BatchTaskOperaInfDTO;
 import com.gic.member.api.service.BatchOperationApiService;
 import com.gic.member.api.service.StoreUpdateApiService;
-import com.gic.member.api.service.UserOwnerApiService;
+import com.gic.member.api.service.UserAscriptionApiService;
 import com.gic.redis.data.util.RedisUtil;
 import com.gic.store.constant.*;
 import com.gic.store.dto.*;
@@ -107,7 +107,7 @@ public class StoreController extends DownloadUtils {
     @Autowired
     private BatchOperationApiService batchOperationApiService;
     @Autowired
-    private UserOwnerApiService userOwnerApiService;
+    private UserAscriptionApiService userAscriptionApiService;
     @Autowired
     private ClerkApiService clerkApiService;
 
@@ -456,7 +456,7 @@ public class StoreController extends DownloadUtils {
             }
             Integer storeInfoId = storeDTO.getStoreInfoId();
             List<Integer> storeInfoIdList = storeInfoList.stream().map(StoreInfoDTO::getStoreInfoId).collect(Collectors.toList());
-            ServiceResponse<Boolean> serviceResponse = userOwnerApiService.transferStore(UserDetailUtils.getUserDetail().getEnterpriseId(), storeInfoIdList, storeInfoId, memberTransType);
+            ServiceResponse<Boolean> serviceResponse = userAscriptionApiService.transferStore(UserDetailUtils.getUserDetail().getEnterpriseId(), storeInfoIdList, storeInfoId, memberTransType);
             return serviceResponse;
         }
         return ServiceResponse.success();

gic-store-web/src/main/resources/dubbo-gic-store-web.xml

@@ -64,7 +64,7 @@
     <dubbo:reference interface="com.gic.enterprise.service.EnterpriseApiService" id="enterpriseApiService" timeout="6000"/>
     <dubbo:reference interface="com.gic.store.service.DictApiService" id="dictApiService" timeout="6000"/>
     <dubbo:reference interface="com.gic.member.api.service.BatchOperationApiService" id="batchOperationApiService" timeout="6000"/>
-    <dubbo:reference interface="com.gic.member.api.service.UserOwnerApiService" id="userOwnerApiService" timeout="6000"/>
+    <dubbo:reference interface="com.gic.member.api.service.UserAscriptionApiService" id="userAscriptionApiService" timeout="6000"/>
     <dubbo:reference interface="com.gic.store.service.StoreWidgetLogApiService" id="storeWidgetLogApiService" timeout="6000"/>
 
 </beans>
\ No newline at end of file