Skip to content

G
gic-data-cloud
Commit 48528271 by 陶光胜
Options

Merge branch 'developer' into 'master' 

Developer

See merge request !27
parents 5e19a8ed 7fdd1964
Showing with 4 additions and 0 deletions
gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/ConsumeStructureController.java
...@@ -54,6 +54,7 @@ public class ConsumeStructureController { ...@@ -54,6 +54,7 @@ public class ConsumeStructureController {
log.info("消费构成-消费年龄-年龄消费占比参数：{}", JSON.toJSONString(params)); log.info("消费构成-消费年龄-年龄消费占比参数：{}", JSON.toJSONString(params));
params.setOnlineStoreIdList(storeSearchUtils.onLineStoreSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJson())); params.setOnlineStoreIdList(storeSearchUtils.onLineStoreSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()));
params.setStoreInfoIdList(storeSearchUtils.storeSearch(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)); return ResultControllerUtils.commonResult(consumeStructureApiService.queryAgeConsumeShare(params));
} }
...@@ -62,6 +63,7 @@ public class ConsumeStructureController { ...@@ -62,6 +63,7 @@ public class ConsumeStructureController {
log.info("消费构成-消费年龄-概况参数：{}", JSON.toJSONString(params)); log.info("消费构成-消费年龄-概况参数：{}", JSON.toJSONString(params));
params.setOnlineStoreIdList(storeSearchUtils.onLineStoreSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJson())); params.setOnlineStoreIdList(storeSearchUtils.onLineStoreSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()));
params.setStoreInfoIdList(storeSearchUtils.storeSearch(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)); return ResultControllerUtils.commonResult(consumeStructureApiService.queryAgeConsumeSurvey(params));
} }
...@@ -100,6 +102,7 @@ public class ConsumeStructureController { ...@@ -100,6 +102,7 @@ public class ConsumeStructureController {
log.info("消费构成-等级-趋势参数：{}", JSON.toJSONString(params)); log.info("消费构成-等级-趋势参数：{}", JSON.toJSONString(params));
params.setOnlineStoreIdList(storeSearchUtils.onLineStoreSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJson())); params.setOnlineStoreIdList(storeSearchUtils.onLineStoreSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()));
params.setStoreInfoIdList(storeSearchUtils.storeSearch(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)); return ResultControllerUtils.commonResult(consumeStructureApiService.queryGradeConsumeTrend(params));
} }
...@@ -108,6 +111,7 @@ public class ConsumeStructureController { ...@@ -108,6 +111,7 @@ public class ConsumeStructureController {
log.info("消费构成-等级-概况参数：{}", JSON.toJSONString(params)); log.info("消费构成-等级-概况参数：{}", JSON.toJSONString(params));
params.setOnlineStoreIdList(storeSearchUtils.onLineStoreSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJson())); params.setOnlineStoreIdList(storeSearchUtils.onLineStoreSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()));
params.setStoreInfoIdList(storeSearchUtils.storeSearch(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)); return ResultControllerUtils.commonResult(consumeStructureApiService.queryGradeConsumeSurvey(params));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment