会员区域调整

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

@@ -84,7 +84,8 @@ public class ConsumeStructureController {
         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); //无归属
+            //无归属
+            params.setCountType(3);
             ServiceResponse<Page<AgeConsumeAreaDTO>> response2 = consumeStructureApiService.pageAgeConsumeArea(params);
             this.goDownComponent.parseWgs(response2, vo);
         }

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

 package com.gic.cloud.web.controller;
 
-import com.gic.api.base.commons.ServiceResponse;
-import com.gic.cloud.dto.EnterprisePortraitRelDTO;
-import com.gic.cloud.service.EnterprisePortraitRelApiService;
-import com.gic.data.api.dto.member.MemberCustomPortraitDTO;
-import com.gic.data.api.qo.member.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -13,15 +12,21 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.alibaba.fastjson.JSON;
+import com.gic.api.base.commons.Page;
+import com.gic.api.base.commons.ServiceResponse;
+import com.gic.cloud.dto.EnterprisePortraitRelDTO;
+import com.gic.cloud.service.EnterprisePortraitRelApiService;
 import com.gic.cloud.web.auth.DataAuthUtils;
+import com.gic.cloud.web.vo.BaseSalesVo;
+import com.gic.cloud.web.vo.LevelVo;
 import com.gic.commons.webapi.reponse.RestResponse;
+import com.gic.data.api.dto.member.MemberCustomPortraitDTO;
+import com.gic.data.api.dto.member.MemberDistributionAreaDTO;
+import com.gic.data.api.dto.member.MemberRecruitAreaDTO;
+import com.gic.data.api.qo.member.*;
 import com.gic.data.api.service.member.MemberCloudDataApiService;
 import com.gic.enterprise.utils.ResultControllerUtils;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
 @RestController
 public class MemberCloudDataController {
     private static final Logger log = LogManager.getLogger(MemberCloudDataController.class);
@@ -33,6 +38,8 @@ public class MemberCloudDataController {
     private DataAuthUtils dataAuthUtils;
     @Autowired
     private EnterprisePortraitRelApiService enterprisePortraitRelApiService;
+    @Autowired
+    private GoDownComponent goDownComponent;
 
     /**
      * 会员分布-趋势
@@ -53,25 +60,45 @@ public class MemberCloudDataController {
     @RequestMapping("get-member-distribution-area")
     public RestResponse pageMemberDistributionArea(MemberDistributionAreaQO params) {
         log.info("会员分布-区域参数：{}", JSON.toJSONString(params));
-        params.setStoreInfoIdList(storeSearchUtils.storeSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()));
-        if (params.getLevel() == null) {
-            params.setLevel(storeSearchUtils.getLevel(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()).getLevel());
+
+        BaseSalesVo vo = new BaseSalesVo();
+        LevelVo levelVo = this.goDownComponent.setValue(params, vo);
+        Integer maxLevel = levelVo.getMaxLevel();
+        params.setCountType(1);
+        ServiceResponse<Page<MemberDistributionAreaDTO>> pageServiceResponse = memberCloudDataApiService.pageMemberDistributionArea(params);
+        vo.setPage(this.goDownComponent.parseData(pageServiceResponse.getResult(), params.getChannel(), params.getEnterpriseId(), params.getLevel(), maxLevel));
+        params.setCountType(2);
+        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);
+            ServiceResponse<Page<MemberDistributionAreaDTO>> response2 = memberCloudDataApiService.pageMemberDistributionArea(params);
+            this.goDownComponent.parseWgs(response2, vo);
         }
-        params.setGroupIdList(storeSearchUtils.getChildrenStoreGroupIdList(params.getParentId()));
-        params.setMemberCardIdList(dataAuthUtils.getMbrAreaId(params.getUserId(), params.getEnterpriseId()));
-        return ResultControllerUtils.commonResult(memberCloudDataApiService.pageMemberDistributionArea(params));
+        return RestResponse.success(vo);
     }
 
     @RequestMapping("get-member-recruit-area")
     public RestResponse pageMemberRecruitArea(MemberRecruitAreaQO params) {
         log.info("会员招募-区域参数：{}", JSON.toJSONString(params));
-        params.setStoreInfoIdList(storeSearchUtils.storeSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()));
-        if (params.getLevel() == null) {
-            params.setLevel(storeSearchUtils.getLevel(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()).getLevel());
+
+        BaseSalesVo vo = new BaseSalesVo();
+        LevelVo levelVo = this.goDownComponent.setValue(params, vo);
+        Integer maxLevel = levelVo.getMaxLevel();
+        params.setCountType(1);
+        ServiceResponse<Page<MemberRecruitAreaDTO>> pageServiceResponse = memberCloudDataApiService.pageMemberRecruitArea(params);
+        vo.setPage(this.goDownComponent.parseData(pageServiceResponse.getResult(), params.getChannel(), params.getEnterpriseId(), params.getLevel(), maxLevel));
+        params.setCountType(2);
+        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);
+            ServiceResponse<Page<MemberRecruitAreaDTO>> response2 = memberCloudDataApiService.pageMemberRecruitArea(params);
+            this.goDownComponent.parseWgs(response2, vo);
         }
-        params.setGroupIdList(storeSearchUtils.getChildrenStoreGroupIdList(params.getParentId()));
-        params.setMemberCardIdList(dataAuthUtils.getMbrAreaId(params.getUserId(), params.getEnterpriseId()));
-        return ResultControllerUtils.commonResult(memberCloudDataApiService.pageMemberRecruitArea(params));
+        return RestResponse.success(vo);
     }
 
     @RequestMapping("get-member-portrait")