Merge branch 'developer' into 'master'

Developer

See merge request !27

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,6 +63,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.queryAgeConsumeSurvey(params));
     }
 
@@ -100,6 +102,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 +111,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));
     }