线下订单资源

gic-evaluate-web/src/main/java/com/gic/evaluate/web/controller/EvaluateOverviewController.java

@@ -3,8 +3,8 @@ package com.gic.evaluate.web.controller;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.auth.constant.ResourceHoldEnum;
-import com.gic.auth.dto.OrderResourceDTO;
-import com.gic.auth.service.ResourceApiService;
+import com.gic.auth.dto.StoreOrderResourceDTO;
+import com.gic.auth.service.ResourceGroupApiService;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.enterprise.utils.ResultControllerUtils;
 import com.gic.enterprise.utils.UserDetailUtils;
@@ -36,14 +36,14 @@ public class EvaluateOverviewController {
     @Autowired
     private StoreWidgetApiService storeWidgetApiService;
     @Autowired
-    private ResourceApiService resourceApiService;
+    private ResourceGroupApiService resourceGroupApiService;
 
     @RequestMapping("/evaluate-chart1")
     public RestResponse evaluateChartOne(String startTime, String endTime, Integer storeWidgetId) {
         List<Integer> storeIdList = Collections.emptyList();
         // 权限判断
         // 判断权限
-        OrderResourceDTO orderResourceDTO = resourceApiService.getOrderResourceByUserId(UserDetailUtils.getUserDetail().getUserId()).getResult();
+        StoreOrderResourceDTO orderResourceDTO = resourceGroupApiService.getStoreOrderResourceByUserId(UserDetailUtils.getUserDetail().getUserId()).getResult();
         if (ResourceHoldEnum.DART.getCode().equals(orderResourceDTO.getType())) {
             if (CollectionUtils.isEmpty(orderResourceDTO.getStoreIdList())) {
                 return RestResponse.success();
@@ -70,7 +70,7 @@ public class EvaluateOverviewController {
     public RestResponse evaluateChartTwo(String startTime, String endTime, Integer storeWidgetId) {
         List<Integer> storeIdList = Collections.emptyList();
         // 判断权限
-        OrderResourceDTO orderResourceDTO = resourceApiService.getOrderResourceByUserId(UserDetailUtils.getUserDetail().getUserId()).getResult();
+        StoreOrderResourceDTO orderResourceDTO = resourceGroupApiService.getStoreOrderResourceByUserId(UserDetailUtils.getUserDetail().getUserId()).getResult();
         if (ResourceHoldEnum.DART.getCode().equals(orderResourceDTO.getType())) {
             if (CollectionUtils.isEmpty(orderResourceDTO.getStoreIdList())) {
                 return RestResponse.success();
@@ -97,7 +97,7 @@ public class EvaluateOverviewController {
     public RestResponse evaluateChartThree(String startTime, String endTime, Integer storeWidgetId) {
         List<Integer> storeIdList = Collections.emptyList();
         // 权限判断
-        OrderResourceDTO orderResourceDTO = resourceApiService.getOrderResourceByUserId(UserDetailUtils.getUserDetail().getUserId()).getResult();
+        StoreOrderResourceDTO orderResourceDTO = resourceGroupApiService.getStoreOrderResourceByUserId(UserDetailUtils.getUserDetail().getUserId()).getResult();
         if (ResourceHoldEnum.DART.getCode().equals(orderResourceDTO.getType())) {
             if (CollectionUtils.isEmpty(orderResourceDTO.getStoreIdList())) {
                 return RestResponse.success();
@@ -123,7 +123,7 @@ public class EvaluateOverviewController {
     public RestResponse evaluateChartFour(String startTime, String endTime, Integer storeWidgetId) {
         List<Integer> storeIdList = Collections.emptyList();
         // 权限判断
-        OrderResourceDTO orderResourceDTO = resourceApiService.getOrderResourceByUserId(UserDetailUtils.getUserDetail().getUserId()).getResult();
+        StoreOrderResourceDTO orderResourceDTO = resourceGroupApiService.getStoreOrderResourceByUserId(UserDetailUtils.getUserDetail().getUserId()).getResult();
         if (ResourceHoldEnum.DART.getCode().equals(orderResourceDTO.getType())) {
             if (CollectionUtils.isEmpty(orderResourceDTO.getStoreIdList())) {
                 return RestResponse.success();
@@ -150,7 +150,7 @@ public class EvaluateOverviewController {
     public RestResponse evaluateStoreScore(StoreScoreQO storeScoreQO) {
         storeScoreQO.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
         // 权限判断
-        OrderResourceDTO orderResourceDTO = resourceApiService.getOrderResourceByUserId(UserDetailUtils.getUserDetail().getUserId()).getResult();
+        StoreOrderResourceDTO orderResourceDTO = resourceGroupApiService.getStoreOrderResourceByUserId(UserDetailUtils.getUserDetail().getUserId()).getResult();
         if (ResourceHoldEnum.DART.getCode().equals(orderResourceDTO.getType())) {
             if (CollectionUtils.isEmpty(orderResourceDTO.getStoreIdList())) {
                 return RestResponse.success();
@@ -173,7 +173,7 @@ public class EvaluateOverviewController {
     public RestResponse evaluateListTrend(StoreTrendQO storeTrendQO) {
         storeTrendQO.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
         // 权限判断
-        OrderResourceDTO orderResourceDTO = resourceApiService.getOrderResourceByUserId(UserDetailUtils.getUserDetail().getUserId()).getResult();
+        StoreOrderResourceDTO orderResourceDTO = resourceGroupApiService.getStoreOrderResourceByUserId(UserDetailUtils.getUserDetail().getUserId()).getResult();
         if (ResourceHoldEnum.DART.getCode().equals(orderResourceDTO.getType())) {
             if (CollectionUtils.isEmpty(orderResourceDTO.getStoreIdList())) {
                 return RestResponse.success();
@@ -190,7 +190,7 @@ public class EvaluateOverviewController {
     public RestResponse listGoodEvaluateTrendByDate(String startTime, String endTime, Integer storeWidgetId) {
         List<Integer> storeIdList = Collections.emptyList();
         // 权限判断
-        OrderResourceDTO orderResourceDTO = resourceApiService.getOrderResourceByUserId(UserDetailUtils.getUserDetail().getUserId()).getResult();
+        StoreOrderResourceDTO orderResourceDTO = resourceGroupApiService.getStoreOrderResourceByUserId(UserDetailUtils.getUserDetail().getUserId()).getResult();
         if (ResourceHoldEnum.DART.getCode().equals(orderResourceDTO.getType())) {
             if (CollectionUtils.isEmpty(orderResourceDTO.getStoreIdList())) {
                 return RestResponse.success();
@@ -211,7 +211,7 @@ public class EvaluateOverviewController {
     public RestResponse listBadEvaluateTrendByDate(String startTime, String endTime, Integer storeWidgetId) {
         List<Integer> storeIdList = Collections.emptyList();
         // 权限判断
-        OrderResourceDTO orderResourceDTO = resourceApiService.getOrderResourceByUserId(UserDetailUtils.getUserDetail().getUserId()).getResult();
+        StoreOrderResourceDTO orderResourceDTO = resourceGroupApiService.getStoreOrderResourceByUserId(UserDetailUtils.getUserDetail().getUserId()).getResult();
         if (ResourceHoldEnum.DART.getCode().equals(orderResourceDTO.getType())) {
             if (CollectionUtils.isEmpty(orderResourceDTO.getStoreIdList())) {
                 return RestResponse.success();
@@ -232,4 +232,5 @@ public class EvaluateOverviewController {
         ServiceResponse<List<Map<String, Integer>>> serviceResponse = evaluateOverviewApiService.listBadEvaluateTrendByDate(UserDetailUtils.getUserDetail().getEnterpriseId(), startTime, endTime, storeIdList);
         return ResultControllerUtils.commonResult(serviceResponse);
     }
+
 }

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

@@ -27,5 +27,6 @@
     <dubbo:reference interface="com.gic.enterprise.service.DownloadReportApiService" id="downloadReportApiService" timeout="6000" retries="0"/>
     <dubbo:reference interface="com.gic.auth.service.MenuApiService" id="menuApiService" timeout="6000" retries="0"/>
     <dubbo:reference interface="com.gic.auth.service.ResourceApiService" id="resourceApiService" timeout="6000" retries="0"/>
+    <dubbo:reference interface="com.gic.auth.service.ResourceGroupApiService" id="resourceGroupApiService" timeout="6000" retries="0"/>
     <dubbo:reference interface="com.gic.open.api.service.EnterpriseLicenseApiService" id="enterpriseLicenseApiService" timeout="6000" retries="0"/>
 </beans>
\ No newline at end of file