Merge branch 'developer' of…

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-data-cloud into developer

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/ConsumeStructureController.java

@@ -54,6 +54,7 @@ public class ConsumeStructureController {
         log.info("消费构成-消费年龄-年龄消费占比参数：{}", JSON.toJSONString(params));
         params.setOnlineStoreIdList(storeSearchUtils.onLineStoreSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()));
         params.setStoreInfoIdList(storeSearchUtils.storeSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()));
+        params.setMemberCardIdList(dataAuthUtils.getMbrAreaId(params.getUserId(), params.getEnterpriseId()));
         return ResultControllerUtils.commonResult(consumeStructureApiService.queryAgeConsumeShare(params));
     }
 
@@ -62,12 +63,14 @@ public class ConsumeStructureController {
         log.info("消费构成-消费年龄-概况参数：{}", JSON.toJSONString(params));
         params.setOnlineStoreIdList(storeSearchUtils.onLineStoreSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()));
         params.setStoreInfoIdList(storeSearchUtils.storeSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()));
+        params.setMemberCardIdList(dataAuthUtils.getMbrAreaId(params.getUserId(), params.getEnterpriseId()));
         return ResultControllerUtils.commonResult(consumeStructureApiService.queryAgeConsumeSurvey(params));
     }
 
     @RequestMapping("get-age-consume-group")
     public RestResponse listAgeConsumeGroup(AgeConsumeAreaQO params) {
         log.info("消费构成-消费年龄-年龄段参数：{}", JSON.toJSONString(params));
+        params.setMemberCardIdList(dataAuthUtils.getMbrAreaId(params.getUserId(), params.getEnterpriseId()));
         return ResultControllerUtils.commonResult(consumeStructureApiService.listAgeConsumeGroup(params));
     }
 
@@ -100,6 +103,7 @@ public class ConsumeStructureController {
         log.info("消费构成-等级-趋势参数：{}", JSON.toJSONString(params));
         params.setOnlineStoreIdList(storeSearchUtils.onLineStoreSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()));
         params.setStoreInfoIdList(storeSearchUtils.storeSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()));
+        params.setMemberCardIdList(dataAuthUtils.getMbrAreaId(params.getUserId(), params.getEnterpriseId()));
         return ResultControllerUtils.commonResult(consumeStructureApiService.queryGradeConsumeTrend(params));
     }
 
@@ -108,6 +112,7 @@ public class ConsumeStructureController {
         log.info("消费构成-等级-概况参数：{}", JSON.toJSONString(params));
         params.setOnlineStoreIdList(storeSearchUtils.onLineStoreSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()));
         params.setStoreInfoIdList(storeSearchUtils.storeSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()));
+        params.setMemberCardIdList(dataAuthUtils.getMbrAreaId(params.getUserId(), params.getEnterpriseId()));
         return ResultControllerUtils.commonResult(consumeStructureApiService.queryGradeConsumeSurvey(params));
     }
 

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/PerformanceOverviewController.java

 package com.gic.cloud.web.controller;
 
+import com.gic.cloud.web.auth.DataAuthUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,12 +20,15 @@ public class PerformanceOverviewController {
     private PerformanceOverviewApiService performanceOverviewApiService;
     @Autowired
     private StoreSearchUtils storeSearchUtils;
+    @Autowired
+    private DataAuthUtils dataAuthUtils;
 
     @RequestMapping("get-performance-overview")
     public RestResponse selectPerformanceOverview(PerformanceOverviewQO params) {
         log.info("业绩概览参数：{}", JSON.toJSONString(params));
         params.setOnlineStoreIdList(storeSearchUtils.onLineStoreSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()));
         params.setStoreInfoIdList(storeSearchUtils.storeSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()));
+        params.setMemberCardIdList(dataAuthUtils.getMbrAreaId(params.getUserId(), params.getEnterpriseId()));
         return ResultControllerUtils.commonResult(performanceOverviewApiService.selectPerformanceOverview(params));
     }
 }