Merge branch 'developer' of…

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-data-cloud into developer

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

@@ -120,6 +120,12 @@ public class GoDownComponent {
         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())) {
+                params.setStoreInfoIdList(new ArrayList<>());
+            }
+            if (CollectionUtils.isEmpty(params.getOnlineStoreIdList())) {
+                params.setOnlineStoreIdList(new ArrayList<>());
+            }
             params.getStoreInfoIdList().add(-1);
             params.getOnlineStoreIdList().add("-1");
         }
@@ -129,6 +135,12 @@ public class GoDownComponent {
         Integer wgs = storeSearchUtils.isWgs(params.getUserId(), params.getEnterpriseId(), params.getSearchJson());
         /**所有渠道或者线下渠道第一层级 合计算上无归属数据**/
         if(wgs == 1){
+            if (CollectionUtils.isEmpty(params.getStoreInfoIdList())) {
+                params.setStoreInfoIdList(new ArrayList<>());
+            }
+            if (CollectionUtils.isEmpty(params.getOnlineStoreIdList())) {
+                params.setOnlineStoreIdList(new ArrayList<>());
+            }
             params.getStoreInfoIdList().add(-1);
             params.getOnlineStoreIdList().add("-1");
         }
@@ -138,6 +150,12 @@ public class GoDownComponent {
         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())) {
+                params.setStoreInfoIdList(new ArrayList<>());
+            }
+            if (CollectionUtils.isEmpty(params.getOnlineStoreIdList())) {
+                params.setOnlineStoreIdList(new ArrayList<>());
+            }
             params.getStoreInfoIdList().clear();
             params.getOnlineStoreIdList().clear();
             params.getStoreInfoIdList().add(-1);
@@ -149,6 +167,12 @@ public class GoDownComponent {
         Integer wgs = storeSearchUtils.isWgs(params.getUserId(), params.getEnterpriseId(), params.getSearchJson());
         if(wgs == 1){
             params.setChannel(null);
+            if (CollectionUtils.isEmpty(params.getStoreInfoIdList())) {
+                params.setStoreInfoIdList(new ArrayList<>());
+            }
+            if (CollectionUtils.isEmpty(params.getOnlineStoreIdList())) {
+                params.setOnlineStoreIdList(new ArrayList<>());
+            }
             params.getStoreInfoIdList().clear();
             params.getOnlineStoreIdList().clear();
             params.getStoreInfoIdList().add(-1);

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

@@ -54,6 +54,8 @@ 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()));
+        params.setOnlineStoreIdList(new ArrayList<>());
+        goDownComponent.setValueTotal(params);
         return ResultControllerUtils.commonResult(memberCloudDataApiService.queryMemberDistributionTrend(params));
     }
 
@@ -61,6 +63,8 @@ public class MemberCloudDataController {
     public RestResponse pageMemberDistributionArea(MemberDistributionAreaQO params) {
         log.info("会员分布-区域参数：{}", JSON.toJSONString(params));
 
+        params.setOnlineStoreIdList(new ArrayList<>());
+
         BaseSalesVo vo = new BaseSalesVo();
         LevelVo levelVo = this.goDownComponent.setValue(params, vo);
         Integer maxLevel = levelVo.getMaxLevel();
@@ -71,11 +75,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);
         }
@@ -85,6 +91,7 @@ public class MemberCloudDataController {
     @RequestMapping("get-member-recruit-area")
     public RestResponse pageMemberRecruitArea(MemberRecruitAreaQO params) {
         log.info("会员招募-区域参数：{}", JSON.toJSONString(params));
+        params.setOnlineStoreIdList(new ArrayList<>());
 
         BaseSalesVo vo = new BaseSalesVo();
         LevelVo levelVo = this.goDownComponent.setValue(params, vo);
@@ -96,11 +103,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);
         }
@@ -110,40 +119,50 @@ public class MemberCloudDataController {
     @RequestMapping("get-member-portrait")
     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.setMemberCardIdList(dataAuthUtils.getMbrAreaId(params.getUserId(), params.getEnterpriseId()));
+        goDownComponent.setValueTotal(params);
         return ResultControllerUtils.commonResult(memberCloudDataApiService.queryMemberBasicPortrait(params));
     }
 
     @RequestMapping("get-member-portrait-overview")
     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.setMemberCardIdList(dataAuthUtils.getMbrAreaId(params.getUserId(), params.getEnterpriseId()));
+        goDownComponent.setValueTotal(params);
         return ResultControllerUtils.commonResult(memberCloudDataApiService.getMemberPortraitOverview(params));
     }
 
     @RequestMapping("get-member-custom-portrait")
     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.setMemberCardIdList(dataAuthUtils.getMbrAreaId(params.getUserId(), params.getEnterpriseId()));
+        goDownComponent.setValueTotal(params);
         return ResultControllerUtils.commonResult(memberCloudDataApiService.queryMemberCustomPortrait(params));
     }
 
     @RequestMapping("get-member-recruit-overview")
     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.setMemberCardIdList(dataAuthUtils.getMbrAreaId(params.getUserId(), params.getEnterpriseId()));
+        goDownComponent.setValueTotal(params);
         return ResultControllerUtils.commonResult(memberCloudDataApiService.getMemberRecruitOverview(params));
     }
 
     @RequestMapping("get-member-recruit-trend")
     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.setMemberCardIdList(dataAuthUtils.getMbrAreaId(params.getUserId(), params.getEnterpriseId()));
+        goDownComponent.setValueTotal(params);
         return ResultControllerUtils.commonResult(memberCloudDataApiService.queryMemberRecruitTrend(params));
     }
 
@@ -185,9 +204,11 @@ public class MemberCloudDataController {
     @RequestMapping("get-member-custom-portrait-field")
     public RestResponse getMemberCustomPortraitField(MemberCustomPortraitQO params) {
         log.info("会员自定义画像-字段筛选参数：{}", JSON.toJSONString(params));
+        params.setOnlineStoreIdList(new ArrayList<>());
         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));
     }
 }