Skip to content

G
gic-data-cloud
Commit 1ef1f75e by 陶光胜
Options

Merge branch 'developer' into 'master' 

观云台小程序

See merge request !35
parents 1481a670 40a32486
Showing with 12 additions and 12 deletions
gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/ConsumeStructureController.java
...@@ -213,8 +213,8 @@ public class ConsumeStructureController { ...@@ -213,8 +213,8 @@ public class ConsumeStructureController {
@RequestMapping("get-old-consume-rate") @RequestMapping("get-old-consume-rate")
public RestResponse getOldConsumeRate(NewOldConsumeRateQO params) { public RestResponse getOldConsumeRate(NewOldConsumeRateQO params) {
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())); params.setMemberCardIdList(dataAuthUtils.getMbrAreaId(params.getUserId(), params.getEnterpriseId()));
goDownComponent.setValueTotal(params); goDownComponent.setValueTotal(params);
return ResultControllerUtils.commonResult(consumeStructureApiService.getOldConsumeRate(params)); return ResultControllerUtils.commonResult(consumeStructureApiService.getOldConsumeRate(params));
...@@ -223,8 +223,8 @@ public class ConsumeStructureController { ...@@ -223,8 +223,8 @@ public class ConsumeStructureController {
@RequestMapping("get-old-consume-trend") @RequestMapping("get-old-consume-trend")
public RestResponse queryOldConsumeTrend(NewOldConsumeRateQO params) { public RestResponse queryOldConsumeTrend(NewOldConsumeRateQO params) {
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())); params.setMemberCardIdList(dataAuthUtils.getMbrAreaId(params.getUserId(), params.getEnterpriseId()));
goDownComponent.setValueTotal(params); goDownComponent.setValueTotal(params);
return ResultControllerUtils.commonResult(consumeStructureApiService.queryOldConsumeTrend(params)); return ResultControllerUtils.commonResult(consumeStructureApiService.queryOldConsumeTrend(params));
...@@ -233,8 +233,8 @@ public class ConsumeStructureController { ...@@ -233,8 +233,8 @@ public class ConsumeStructureController {
@RequestMapping("get-old-consume-survey") @RequestMapping("get-old-consume-survey")
public RestResponse getBirthConsumeSurvey(NewOldConsumeRateQO params) { public RestResponse getBirthConsumeSurvey(NewOldConsumeRateQO params) {
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())); params.setMemberCardIdList(dataAuthUtils.getMbrAreaId(params.getUserId(), params.getEnterpriseId()));
goDownComponent.setValueTotal(params); goDownComponent.setValueTotal(params);
return ResultControllerUtils.commonResult(consumeStructureApiService.queryNewOldConsumeSurvey(params)); return ResultControllerUtils.commonResult(consumeStructureApiService.queryNewOldConsumeSurvey(params));
...@@ -269,8 +269,8 @@ public class ConsumeStructureController { ...@@ -269,8 +269,8 @@ public class ConsumeStructureController {
@RequestMapping("get-whether-consume-rate") @RequestMapping("get-whether-consume-rate")
public RestResponse getWhetherConsumeRate(WhetherConsumeRateQO params) { public RestResponse getWhetherConsumeRate(WhetherConsumeRateQO params) {
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())); params.setMemberCardIdList(dataAuthUtils.getMbrAreaId(params.getUserId(), params.getEnterpriseId()));
goDownComponent.setValueTotal(params); goDownComponent.setValueTotal(params);
return ResultControllerUtils.commonResult(consumeStructureApiService.getWhetherConsumeRate(params)); return ResultControllerUtils.commonResult(consumeStructureApiService.getWhetherConsumeRate(params));
...@@ -279,8 +279,8 @@ public class ConsumeStructureController { ...@@ -279,8 +279,8 @@ public class ConsumeStructureController {
@RequestMapping("get-whether-consume-trend") @RequestMapping("get-whether-consume-trend")
public RestResponse queryWhetherConsumeTrend(WhetherConsumeRateQO params) { public RestResponse queryWhetherConsumeTrend(WhetherConsumeRateQO params) {
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())); params.setMemberCardIdList(dataAuthUtils.getMbrAreaId(params.getUserId(), params.getEnterpriseId()));
goDownComponent.setValueTotal(params); goDownComponent.setValueTotal(params);
return ResultControllerUtils.commonResult(consumeStructureApiService.queryWhetherConsumeTrend(params)); return ResultControllerUtils.commonResult(consumeStructureApiService.queryWhetherConsumeTrend(params));
...@@ -289,8 +289,8 @@ public class ConsumeStructureController { ...@@ -289,8 +289,8 @@ public class ConsumeStructureController {
@RequestMapping("get-whether-consume-survey") @RequestMapping("get-whether-consume-survey")
public RestResponse queryWhetherConsumeSurvey(WhetherConsumeRateQO params) { public RestResponse queryWhetherConsumeSurvey(WhetherConsumeRateQO params) {
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())); params.setMemberCardIdList(dataAuthUtils.getMbrAreaId(params.getUserId(), params.getEnterpriseId()));
goDownComponent.setValueTotal(params); goDownComponent.setValueTotal(params);
return ResultControllerUtils.commonResult(consumeStructureApiService.queryWhetherConsumeSurvey(params)); return ResultControllerUtils.commonResult(consumeStructureApiService.queryWhetherConsumeSurvey(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