删除旧的资源组接口

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

 package com.gic.store.service.outer.impl;
 
+import java.util.*;
+import java.util.stream.Collectors;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.application.center.api.dto.ApplicationResourceDTO;
 import com.gic.application.center.api.service.AuthorizeService;
-import com.gic.auth.dto.ResourceDTO;
-import com.gic.auth.service.ResourceApiService;
+import com.gic.auth.dto.ResourceGroupDTO;
+import com.gic.auth.service.ResourceGroupApiService;
 import com.gic.commons.util.DateUtil;
 import com.gic.commons.util.EntityUtil;
 import com.gic.enterprise.constants.Constants;
@@ -23,20 +33,14 @@ import com.gic.store.constant.ClerkGenderEnum;
 import com.gic.store.constant.CreateTypeEnum;
 import com.gic.store.constant.StoreLogReasonEnum;
 import com.gic.store.dto.*;
-import com.gic.store.dto.open.ClerkDTO;
 import com.gic.store.dto.open.*;
+import com.gic.store.dto.open.ClerkDTO;
 import com.gic.store.dto.open.StoreGroupDTO;
-import com.gic.store.entity.*;
+import com.gic.store.entity.TabClerk;
+import com.gic.store.entity.TabStore;
+import com.gic.store.entity.TabStoreBrand;
+import com.gic.store.entity.TabStoreGroup;
 import com.gic.store.service.*;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * 
@@ -76,11 +80,11 @@ public class StoreOpenApiServiceImpl implements StoreOpenApiService {
     @Autowired
     private StoreWidgetApiService storeWidgetApiService;
     @Autowired
-    private ResourceApiService resourceApiService;
-    @Autowired
     private StoreRegionService storeRegionService;
     @Autowired
     private StoreGroupApiService storeGroupApiService;
+    @Autowired
+    private ResourceGroupApiService resourceGroupApiService;
 
     @Override
     public ServiceResponse<String> getApiFieldJson(Integer enterpriseId, Integer regionId) {
@@ -798,8 +802,8 @@ public class StoreOpenApiServiceImpl implements StoreOpenApiService {
                 if (resourceId == null) {
                     return Collections.emptyList();
                 }
-                ServiceResponse<ResourceDTO> resourceResult = resourceApiService.getResource(resourceId);
-                if (resourceResult.isSuccess()) {
+                ServiceResponse<ResourceGroupDTO> resourceResult = resourceGroupApiService.getResourceGroup(resourceId);
+                if (resourceResult.isSuccess() && resourceResult.getResult() != null) {
                     LOGGER.info("对外API权限校验结果-门店资源ID:{}", JSON.toJSONString(resourceResult));
                     Long storeResourceId = resourceResult.getResult().getStoreResource();
                     //查询门店资源组所有的门店权限

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

@@ -58,7 +58,6 @@
 
     <dubbo:reference interface="com.gic.erp.operation.api.service.ApiFieldApiService" id="apiFieldApiService" timeout="60000" />
     <dubbo:reference interface="com.gic.application.center.api.service.AuthorizeService" id="authorizeService" timeout="60000" />
-    <dubbo:reference interface="com.gic.auth.service.ResourceApiService" id="resourceApiService" timeout="60000" />
 
     <dubbo:service interface="com.gic.store.service.StoreTagApiService" ref="storeTagApiService" timeout="6000" />
     <dubbo:service interface="com.gic.store.service.StoreTagTmpApiService" ref="storeTagTmpApiService" timeout="6000" />
@@ -72,4 +71,5 @@
     <dubbo:reference interface="com.gic.spark.api.service.SparkJobApiService" id="sparkJobApiService" timeout="6000"/>
     <dubbo:reference interface="com.gic.member.config.api.service.CardAscriptionConfigService" id="cardAscriptionConfigService" timeout="6000"/>
     <dubbo:reference interface="com.gic.auth.service.UserApiService" id="userApiService" timeout="6000"/>
+    <dubbo:reference interface="com.gic.auth.service.ResourceGroupApiService" id="resourceGroupApiService" timeout="6000"/>
 </beans>