Merge branch 'developer' into 'master'

观云台小程序

See merge request !34

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

@@ -52,8 +52,8 @@ public class ConsumeStructureController {
     @RequestMapping("get-age-consume-share")
     public RestResponse queryAgeConsumeShare(AgeConsumeShareQO 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.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()));
         goDownComponent.setValueTotal(params);
         return ResultControllerUtils.commonResult(consumeStructureApiService.queryAgeConsumeShare(params));
@@ -62,8 +62,8 @@ public class ConsumeStructureController {
     @RequestMapping("get-age-consume-survey")
     public RestResponse queryAgeConsumeSurvey(AgeConsumeShareQO 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.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()));
         goDownComponent.setValueTotal(params);
         return ResultControllerUtils.commonResult(consumeStructureApiService.queryAgeConsumeSurvey(params));
@@ -105,8 +105,8 @@ public class ConsumeStructureController {
     @RequestMapping("get-grade-consume-trend")
     public RestResponse getGradeConsumeTrend(GradeConsumeTrendQO 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.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()));
         goDownComponent.setValueTotal(params);
         return ResultControllerUtils.commonResult(consumeStructureApiService.queryGradeConsumeTrend(params));
@@ -115,8 +115,8 @@ public class ConsumeStructureController {
     @RequestMapping("get-grade-consume-survey")
     public RestResponse getGradeConsumeSurvey(GradeConsumeTrendQO 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.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()));
         goDownComponent.setValueTotal(params);
         return ResultControllerUtils.commonResult(consumeStructureApiService.queryGradeConsumeSurvey(params));
@@ -157,8 +157,8 @@ public class ConsumeStructureController {
     @RequestMapping("get-birth-consume-rate")
     public RestResponse getBirthConsumeRate(BirthConsumeRateQO 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.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()));
         goDownComponent.setValueTotal(params);
         return ResultControllerUtils.commonResult(consumeStructureApiService.getBirthConsumeRate(params));
@@ -167,8 +167,8 @@ public class ConsumeStructureController {
     @RequestMapping("get-birth-consume-trend")
     public RestResponse getBirthConsumeTrend(BirthConsumeRateQO 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.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()));
         goDownComponent.setValueTotal(params);
         return ResultControllerUtils.commonResult(consumeStructureApiService.queryBirthConsumeTrend(params));
@@ -177,8 +177,8 @@ public class ConsumeStructureController {
     @RequestMapping("get-birth-consume-survey")
     public RestResponse getBirthConsumeSurvey(BirthConsumeRateQO 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.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()));
         goDownComponent.setValueTotal(params);
         return ResultControllerUtils.commonResult(consumeStructureApiService.queryBirthConsumeSurvey(params));

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

@@ -80,11 +80,11 @@ public class GoDownComponent {
     }
 
     public LevelVo setValue(CommonQO params, BaseSalesVo vo){
-        params.setOnlineStoreIdList(storeSearchUtils.onLineStoreSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()));
-        params.setStoreInfoIdList(storeSearchUtils.storeSearch(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.setMemberCardIdList(dataAuthUtils.getMbrAreaId(params.getUserId(), params.getEnterpriseId()));
         /******线下渠道需要点击下钻，该值只会在线下时才会使用********/
-        LevelVo levelVo = this.storeSearchUtils.getLevel(params.getUserId(), params.getEnterpriseId(), params.getSearchJson());
+        LevelVo levelVo = this.storeSearchUtils.getLevel(params.getUserId(), params.getEnterpriseId(), params.getSearchJSON());
         if(params.getLevel() == null){
             params.setLevel(levelVo.getLevel());
         }
@@ -98,7 +98,7 @@ public class GoDownComponent {
         /****首页进入基础页面时，如果渠道为空，根据当前条件判断渠道，channel==null表示多渠道***/
         if(params.getChannel() == null){
             /**********设置层级名称，只有在首次进入页面会展示，下钻均显示返回上一级*********/
-            Integer newChannel = this.storeSearchUtils.getChannel(params.getUserId(), params.getEnterpriseId(), params.getSearchJson());
+            Integer newChannel = this.storeSearchUtils.getChannel(params.getUserId(), params.getEnterpriseId(), params.getSearchJSON());
             params.setChannel(newChannel);
         }
         /***********如果是线下的第一层级，需要展示切换层级按钮*************/
@@ -117,7 +117,7 @@ public class GoDownComponent {
 
 
     public void setValueTotal(CommonQO params, LevelVo levelVo){
-        Integer wgs = storeSearchUtils.isWgs(params.getUserId(), params.getEnterpriseId(), params.getSearchJson());
+        Integer wgs = storeSearchUtils.isWgs(params.getUserId(), params.getEnterpriseId(), params.getSearchJSON());
         /**所有渠道或者线下渠道第一层级 合计算上无归属数据**/
         if((params.getChannel() == null || (params.getChannel() == StoreChannelEnum.OFFLINE.getChannel() && params.getLevel() == levelVo.getLevel())) && wgs == 1){
             if (CollectionUtils.isEmpty(params.getStoreInfoIdList())) {
@@ -132,7 +132,7 @@ public class GoDownComponent {
     }
 
     public void setValueTotal(CommonQO params){
-        Integer wgs = storeSearchUtils.isWgs(params.getUserId(), params.getEnterpriseId(), params.getSearchJson());
+        Integer wgs = storeSearchUtils.isWgs(params.getUserId(), params.getEnterpriseId(), params.getSearchJSON());
         /**所有渠道或者线下渠道第一层级 合计算上无归属数据**/
         if(wgs == 1){
             if (CollectionUtils.isEmpty(params.getStoreInfoIdList())) {
@@ -147,7 +147,7 @@ public class GoDownComponent {
     }
 
     public void setValueWgs(CommonQO params, LevelVo levelVo){
-        Integer wgs = storeSearchUtils.isWgs(params.getUserId(), params.getEnterpriseId(), params.getSearchJson());
+        Integer wgs = storeSearchUtils.isWgs(params.getUserId(), params.getEnterpriseId(), params.getSearchJSON());
         if(params.getChannel() != null && params.getChannel() == 1 && params.getLevel() == levelVo.getLevel() && wgs == 1){
             params.setChannel(null);
             if (CollectionUtils.isEmpty(params.getStoreInfoIdList())) {
@@ -164,7 +164,7 @@ public class GoDownComponent {
     }
 
     public void setValueWgs(CommonQO params){
-        Integer wgs = storeSearchUtils.isWgs(params.getUserId(), params.getEnterpriseId(), params.getSearchJson());
+        Integer wgs = storeSearchUtils.isWgs(params.getUserId(), params.getEnterpriseId(), params.getSearchJSON());
         if(wgs == 1){
             params.setChannel(null);
             if (CollectionUtils.isEmpty(params.getStoreInfoIdList())) {

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

@@ -52,7 +52,7 @@ public class MemberCloudDataController {
     @RequestMapping("get-member-distribution-trend")
     public RestResponse queryMemberDistributionTrend(MemberDistributionTrendQO params) {
         log.info("会员分布-趋势参数：{}", JSON.toJSONString(params));
-        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.setOnlineStoreIdList(new ArrayList<>());
         goDownComponent.setValueTotal(params);
@@ -120,7 +120,7 @@ public class MemberCloudDataController {
     public RestResponse queryMemberBasicPortrait(MemberPortraitQO params) {
         log.info("会员基础画像参数：{}", JSON.toJSONString(params));
         params.setOnlineStoreIdList(new ArrayList<>());
-        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()));
         goDownComponent.setValueTotal(params);
         return ResultControllerUtils.commonResult(memberCloudDataApiService.queryMemberBasicPortrait(params));
@@ -130,7 +130,7 @@ public class MemberCloudDataController {
     public RestResponse getMemberPortraitOverview(MemberPortraitQO params) {
         log.info("会员画像-概况参数：{}", JSON.toJSONString(params));
         params.setOnlineStoreIdList(new ArrayList<>());
-        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()));
         goDownComponent.setValueTotal(params);
         return ResultControllerUtils.commonResult(memberCloudDataApiService.getMemberPortraitOverview(params));
@@ -140,7 +140,7 @@ public class MemberCloudDataController {
     public RestResponse queryMemberCustomPortrait(MemberCustomPortraitQO params) {
         log.info("会员自定义画像参数：{}", JSON.toJSONString(params));
         params.setOnlineStoreIdList(new ArrayList<>());
-        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()));
         goDownComponent.setValueTotal(params);
         return ResultControllerUtils.commonResult(memberCloudDataApiService.queryMemberCustomPortrait(params));
@@ -150,7 +150,7 @@ public class MemberCloudDataController {
     public RestResponse getMemberRecruitOverview(MemberOverviewQO params) {
         log.info("会员概况-会员招募概况参数：{}", JSON.toJSONString(params));
         params.setOnlineStoreIdList(new ArrayList<>());
-        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()));
         goDownComponent.setValueTotal(params);
         return ResultControllerUtils.commonResult(memberCloudDataApiService.getMemberRecruitOverview(params));
@@ -160,7 +160,7 @@ public class MemberCloudDataController {
     public RestResponse queryMemberRecruitTrend(MemberOverviewQO params) {
         log.info("会员概况-会员招募趋势参数：{}", JSON.toJSONString(params));
         params.setOnlineStoreIdList(new ArrayList<>());
-        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()));
         goDownComponent.setValueTotal(params);
         return ResultControllerUtils.commonResult(memberCloudDataApiService.queryMemberRecruitTrend(params));
@@ -206,7 +206,7 @@ public class MemberCloudDataController {
         log.info("会员自定义画像-字段筛选参数：{}", JSON.toJSONString(params));
         params.setOnlineStoreIdList(new ArrayList<>());
         Integer enterpriseId = params.getEnterpriseId();
-        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()));
         goDownComponent.setValueTotal(params);
         ServiceResponse<List<MemberCustomPortraitDTO>> fieldListRes = memberCloudDataApiService.listCustomField(params);

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

@@ -29,8 +29,8 @@ public class PerformanceOverviewController {
     @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.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()));
         goDownComponent.setValueTotal(params);
         return ResultControllerUtils.commonResult(performanceOverviewApiService.selectPerformanceOverview(params));