删除旧的资源组接口

src/main/java/com/gic/plug/web/controller/StoreController.java

@@ -4,14 +4,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
-import com.gic.auth.dto.ResourceGroupDTO;
-import com.gic.auth.service.ResourceGroupApiService;
-import com.gic.enterprise.error.ErrorCode;
-import com.gic.enterprise.utils.ResultControllerUtils;
-import com.gic.plug.web.utils.StoreResourceAuthUtils;
-import com.gic.plug.web.utils.storeresourceauth.StoreResourceUtils;
-import com.gic.store.dto.StoreWidgetLogDTO;
-import com.gic.store.service.StoreWidgetLogApiService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,19 +16,21 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.ServiceResponse;
-import com.gic.auth.dto.ResourceDTO;
+import com.gic.auth.dto.ResourceGroupDTO;
 import com.gic.auth.dto.UserResourceDTO;
-import com.gic.auth.service.ResourceApiService;
+import com.gic.auth.service.ResourceGroupApiService;
 import com.gic.auth.service.UserResourceApiService;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.webapi.reponse.RestResponse;
+import com.gic.enterprise.utils.ResultControllerUtils;
 import com.gic.enterprise.utils.UserDetail;
 import com.gic.enterprise.utils.UserDetailUtils;
 import com.gic.plug.web.qo.StoreWidgetCountQO;
 import com.gic.plug.web.qo.StoreWidgetQO;
 import com.gic.plug.web.strategy.init.StrategyInit;
-import com.gic.plug.web.utils.StoreRegionAuthUtil;
+import com.gic.plug.web.utils.StoreResourceAuthUtils;
 import com.gic.plug.web.utils.StoreWidgetLogUtils;
+import com.gic.plug.web.utils.storeresourceauth.StoreResourceUtils;
 import com.gic.plug.web.vo.*;
 import com.gic.store.constant.StoreESFieldsEnum;
 import com.gic.store.dto.StoreRegionDTO;
@@ -45,6 +39,7 @@ import com.gic.store.dto.StoreWidgetDTO;
 import com.gic.store.service.StoreApiService;
 import com.gic.store.service.StoreRegionApiService;
 import com.gic.store.service.StoreWidgetApiService;
+import com.gic.store.service.StoreWidgetLogApiService;
 
 /**
  * @author zhiwj
@@ -65,8 +60,6 @@ public class StoreController {
     @Autowired
     private UserResourceApiService userResourceApiService;
     @Autowired
-    private ResourceApiService resourceApiService;
-    @Autowired
     private StoreWidgetLogUtils storeWidgetLogUtils;
     @Autowired
     private StoreWidgetLogApiService storeWidgetLogApiService;
@@ -224,9 +217,8 @@ public class StoreController {
         ServiceResponse<UserResourceDTO> resource = this.userResourceApiService
                 .getResourceByUserId(userId);
         if (resource.isSuccess() && resource.getResult() != null) {
-            //todo 前端对齐之后，要切换最新的接口 resourceGroupApiService
-            ServiceResponse<ResourceDTO> serviceResource = this.resourceApiService
-                    .getResource(resource.getResult().getResourceId());
+            ServiceResponse<ResourceGroupDTO> serviceResource = this.resourceGroupApiService
+                    .getResourceGroup(resource.getResult().getResourceId());
             //资源组-门店选择器ID
             if(serviceResource.isSuccess() && serviceResource.getResult() != null){
                 ServiceResponse<StoreWidgetDTO> storeWidget = this.storeWidgetApiService

src/main/resources/dubbo-gic-webapp-plug.xml

@@ -58,7 +58,6 @@
     <dubbo:reference interface="com.gic.mall.share.api.service.ShopApiService" id="shopApiService" timeout="10000" retries="0" />
     <dubbo:reference interface="com.gic.member.config.api.service.AppletsConfigApiService" id="appletsConfigApiService" timeout="10000" retries="0" />
     <dubbo:reference interface="com.gic.auth.service.UserResourceApiService" id="userResourceApiService" timeout="10000" retries="0" />
-    <dubbo:reference interface="com.gic.auth.service.ResourceApiService" id="resourceApiService" timeout="10000" retries="0" />
     <dubbo:reference interface="com.gic.store.service.StoreTagApiService" id="storeTagApiService" timeout="10000" retries="0" />
     <dubbo:reference interface="com.gic.mall.api.service.MallCordApiService" id="mallCordApiService" timeout="10000" retries="0" />
     <dubbo:reference interface="com.gic.mall.api.service.MallProApiService" id="mallProApiService" timeout="10000" retries="0" />