Merge branch 'developer' into 'master'

Developer

See merge request !30

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

@@ -55,6 +55,7 @@ public class ConsumeStructureController {
         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));
     }
 
@@ -64,6 +65,7 @@ public class ConsumeStructureController {
         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));
     }
 
@@ -87,11 +89,13 @@ public class ConsumeStructureController {
         }
         vo.setPage(this.goDownComponent.parseData(pageServiceResponse.getResult(), params.getChannel(), params.getEnterpriseId(), params.getLevel(), maxLevel));
         params.setCountType(2);
+        goDownComponent.setValueTotal(params, levelVo);
         ServiceResponse<Page<AgeConsumeAreaDTO>> response1 = consumeStructureApiService.pageAgeConsumeArea(params);
         this.goDownComponent.parseTotal(response1, vo);
         if(params.getChannel() != null && params.getChannel() == 1 && params.getLevel() == levelVo.getLevel()){
             //无归属
             params.setCountType(3);
+            goDownComponent.setValueWgs(params, levelVo);
             ServiceResponse<Page<AgeConsumeAreaDTO>> response2 = consumeStructureApiService.pageAgeConsumeArea(params);
             this.goDownComponent.parseWgs(response2, vo);
         }
@@ -104,6 +108,7 @@ public class ConsumeStructureController {
         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));
     }
 
@@ -113,6 +118,7 @@ public class ConsumeStructureController {
         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));
     }
 
@@ -129,10 +135,13 @@ public class ConsumeStructureController {
         }
         vo.setPage(this.goDownComponent.parseData(pageServiceResponse.getResult(), params.getChannel(), params.getEnterpriseId(), params.getLevel(), maxLevel));
         params.setCountType(2);
+        goDownComponent.setValueTotal(params, levelVo);
         ServiceResponse<Page<GradeConsumeAreaDTO>> response1 = consumeStructureApiService.pageGradeConsumeArea(params);
         this.goDownComponent.parseTotal(response1, vo);
         if(params.getChannel() != null && params.getChannel() == 1 && params.getLevel() == levelVo.getLevel()){
-            params.setCountType(3); //无归属
+            params.setCountType(3);
+            //无归属
+            goDownComponent.setValueWgs(params, levelVo);
             ServiceResponse<Page<GradeConsumeAreaDTO>> response2 = consumeStructureApiService.pageGradeConsumeArea(params);
             this.goDownComponent.parseWgs(response2, vo);
         }
@@ -151,6 +160,7 @@ public class ConsumeStructureController {
         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));
     }
 
@@ -160,6 +170,7 @@ public class ConsumeStructureController {
         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));
     }
 
@@ -169,6 +180,7 @@ public class ConsumeStructureController {
         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));
     }
 
@@ -185,10 +197,13 @@ public class ConsumeStructureController {
         }
         vo.setPage(this.goDownComponent.parseData(pageServiceResponse.getResult(), params.getChannel(), params.getEnterpriseId(), params.getLevel(), maxLevel));
         params.setCountType(2);
+        goDownComponent.setValueTotal(params, levelVo);
         ServiceResponse<Page<BirthConsumeAreaDTO>> response1 = consumeStructureApiService.pageBirthConsumeArea(params);
         this.goDownComponent.parseTotal(response1, vo);
         if(params.getChannel() != null && params.getChannel() == 1 && params.getLevel() == levelVo.getLevel()){
-            params.setCountType(3); //无归属
+            params.setCountType(3);
+            //无归属
+            goDownComponent.setValueWgs(params, levelVo);
             ServiceResponse<Page<BirthConsumeAreaDTO>> response2 = consumeStructureApiService.pageBirthConsumeArea(params);
             this.goDownComponent.parseWgs(response2, vo);
         }
@@ -201,6 +216,7 @@ public class ConsumeStructureController {
         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.getOldConsumeRate(params));
     }
 
@@ -210,6 +226,7 @@ public class ConsumeStructureController {
         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.queryOldConsumeTrend(params));
     }
 
@@ -219,6 +236,7 @@ public class ConsumeStructureController {
         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.queryNewOldConsumeSurvey(params));
     }
 
@@ -235,10 +253,13 @@ public class ConsumeStructureController {
         }
         vo.setPage(this.goDownComponent.parseData(pageServiceResponse.getResult(), params.getChannel(), params.getEnterpriseId(), params.getLevel(), maxLevel));
         params.setCountType(2);
+        goDownComponent.setValueTotal(params, levelVo);
         ServiceResponse<Page<NewOldConsumeAreaDTO>> response1 = consumeStructureApiService.pageNewOldConsumeArea(params);
         this.goDownComponent.parseTotal(response1, vo);
         if(params.getChannel() != null && params.getChannel() == 1 && params.getLevel() == levelVo.getLevel()){
-            params.setCountType(3); //无归属
+            params.setCountType(3);
+            //无归属
+            goDownComponent.setValueWgs(params, levelVo);
             ServiceResponse<Page<NewOldConsumeAreaDTO>> response2 = consumeStructureApiService.pageNewOldConsumeArea(params);
             this.goDownComponent.parseWgs(response2, vo);
         }
@@ -251,6 +272,7 @@ public class ConsumeStructureController {
         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.getWhetherConsumeRate(params));
     }
 
@@ -260,6 +282,7 @@ public class ConsumeStructureController {
         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.queryWhetherConsumeTrend(params));
     }
 
@@ -269,6 +292,7 @@ public class ConsumeStructureController {
         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.queryWhetherConsumeSurvey(params));
     }
 
@@ -285,11 +309,13 @@ public class ConsumeStructureController {
         }
         vo.setPage(this.goDownComponent.parseData(pageServiceResponse.getResult(), params.getChannel(), params.getEnterpriseId(), params.getLevel(), maxLevel));
         params.setCountType(2);
+        goDownComponent.setValueTotal(params, levelVo);
         ServiceResponse<Page<WhetherConsumeAreaDTO>> response1 = consumeStructureApiService.pageWhetherConsumeArea(params);
         this.goDownComponent.parseTotal(response1, vo);
         if(params.getChannel() != null && params.getChannel() == 1 && params.getLevel() == levelVo.getLevel()){
             //无归属
             params.setCountType(3);
+            goDownComponent.setValueWgs(params, levelVo);
             ServiceResponse<Page<WhetherConsumeAreaDTO>> response2 = consumeStructureApiService.pageWhetherConsumeArea(params);
             this.goDownComponent.parseWgs(response2, vo);
         }

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

@@ -115,6 +115,47 @@ public class GoDownComponent {
         return levelVo;
     }
 
+
+    public void setValueTotal(CommonQO params, LevelVo levelVo){
+        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){
+            params.getStoreInfoIdList().add(-1);
+            params.getOnlineStoreIdList().add("-1");
+        }
+    }
+
+    public void setValueTotal(CommonQO params){
+        Integer wgs = storeSearchUtils.isWgs(params.getUserId(), params.getEnterpriseId(), params.getSearchJson());
+        /**所有渠道或者线下渠道第一层级 合计算上无归属数据**/
+        if(wgs == 1){
+            params.getStoreInfoIdList().add(-1);
+            params.getOnlineStoreIdList().add("-1");
+        }
+    }
+
+    public void setValueWgs(CommonQO params, LevelVo levelVo){
+        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);
+            params.getStoreInfoIdList().clear();
+            params.getOnlineStoreIdList().clear();
+            params.getStoreInfoIdList().add(-1);
+            params.getOnlineStoreIdList().add("-1");
+        }
+    }
+
+    public void setValueWgs(CommonQO params){
+        Integer wgs = storeSearchUtils.isWgs(params.getUserId(), params.getEnterpriseId(), params.getSearchJson());
+        if(wgs == 1){
+            params.setChannel(null);
+            params.getStoreInfoIdList().clear();
+            params.getOnlineStoreIdList().clear();
+            params.getStoreInfoIdList().add(-1);
+            params.getOnlineStoreIdList().add("-1");
+        }
+    }
+
     public Page<?> parseData(Page<?> page , Integer channel, Integer enterpriseId, Integer level, Integer maxLevel){
         if(page != null && CollectionUtils.isNotEmpty(page.getResult())){
             if(channel == null){  //全渠道

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

@@ -54,6 +54,7 @@ public class MemberCloudDataController {
         log.info("会员分布-趋势参数：{}", JSON.toJSONString(params));
         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.queryMemberDistributionTrend(params));
     }
 
@@ -71,11 +72,13 @@ public class MemberCloudDataController {
         }
         vo.setPage(this.goDownComponent.parseData(pageServiceResponse.getResult(), params.getChannel(), params.getEnterpriseId(), params.getLevel(), maxLevel));
         params.setCountType(2);
+        goDownComponent.setValueTotal(params, levelVo);
         ServiceResponse<Page<MemberDistributionAreaDTO>> response1 = memberCloudDataApiService.pageMemberDistributionArea(params);
         this.goDownComponent.parseTotal(response1, vo);
         if(params.getChannel() != null && params.getChannel() == 1 && params.getLevel() == levelVo.getLevel()){
             //无归属
             params.setCountType(3);
+            goDownComponent.setValueWgs(params, levelVo);
             ServiceResponse<Page<MemberDistributionAreaDTO>> response2 = memberCloudDataApiService.pageMemberDistributionArea(params);
             this.goDownComponent.parseWgs(response2, vo);
         }
@@ -96,11 +99,13 @@ public class MemberCloudDataController {
         }
         vo.setPage(this.goDownComponent.parseData(pageServiceResponse.getResult(), params.getChannel(), params.getEnterpriseId(), params.getLevel(), maxLevel));
         params.setCountType(2);
+        goDownComponent.setValueTotal(params, levelVo);
         ServiceResponse<Page<MemberRecruitAreaDTO>> response1 = memberCloudDataApiService.pageMemberRecruitArea(params);
         this.goDownComponent.parseTotal(response1, vo);
         if(params.getChannel() != null && params.getChannel() == 1 && params.getLevel() == levelVo.getLevel()){
             //无归属
             params.setCountType(3);
+            goDownComponent.setValueWgs(params, levelVo);
             ServiceResponse<Page<MemberRecruitAreaDTO>> response2 = memberCloudDataApiService.pageMemberRecruitArea(params);
             this.goDownComponent.parseWgs(response2, vo);
         }
@@ -112,6 +117,7 @@ public class MemberCloudDataController {
         log.info("会员基础画像参数：{}", JSON.toJSONString(params));
         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));
     }
 
@@ -120,6 +126,7 @@ public class MemberCloudDataController {
         log.info("会员画像-概况参数：{}", JSON.toJSONString(params));
         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));
     }
 
@@ -128,6 +135,7 @@ public class MemberCloudDataController {
         log.info("会员自定义画像参数：{}", JSON.toJSONString(params));
         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));
     }
 
@@ -136,6 +144,7 @@ public class MemberCloudDataController {
         log.info("会员概况-会员招募概况参数：{}", JSON.toJSONString(params));
         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));
     }
 
@@ -144,6 +153,7 @@ public class MemberCloudDataController {
         log.info("会员概况-会员招募趋势参数：{}", JSON.toJSONString(params));
         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));
     }
 
@@ -188,6 +198,7 @@ public class MemberCloudDataController {
         Integer enterpriseId = params.getEnterpriseId();
         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);
         if (fieldListRes.isSuccess()) {
             List<MemberCustomPortraitDTO> fieldList = fieldListRes.getResult();

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

@@ -22,6 +22,9 @@ public class PerformanceOverviewController {
     private StoreSearchUtils storeSearchUtils;
     @Autowired
     private DataAuthUtils dataAuthUtils;
+    @Autowired
+    private GoDownComponent goDownComponent;
+
 
     @RequestMapping("get-performance-overview")
     public RestResponse selectPerformanceOverview(PerformanceOverviewQO params) {
@@ -29,6 +32,7 @@ public class PerformanceOverviewController {
         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));
     }
 }