Merge branch 'developer' into 'master'

线下第一层合集统计加上无归属

See merge request !60

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

@@ -84,7 +84,7 @@ public class ConsumeStructureController {
         }
         vo.setPage(this.goDownComponent.parseData(pageServiceResponse.getResult(), params.getChannel(), params.getEnterpriseId(), params.getLevel(), maxLevel));
         params.setCountType(2);
-        goDownComponent.setValueTotal(params, levelVo);
+        goDownComponent.setValueTotalForArea(params, levelVo);
         ServiceResponse<Page<AgeConsumeAreaDTO>> response1 = consumeStructureApiService.pageAgeConsumeArea(params);
         this.goDownComponent.parseTotal(response1, vo);
         if(params.getChannel() != null && params.getChannel() == 1 && params.getLevel().intValue() == levelVo.getLevel()){
@@ -130,7 +130,7 @@ public class ConsumeStructureController {
         }
         vo.setPage(this.goDownComponent.parseData(pageServiceResponse.getResult(), params.getChannel(), params.getEnterpriseId(), params.getLevel(), maxLevel));
         params.setCountType(2);
-        goDownComponent.setValueTotal(params, levelVo);
+        goDownComponent.setValueTotalForArea(params, levelVo);
         ServiceResponse<Page<GradeConsumeAreaDTO>> response1 = consumeStructureApiService.pageGradeConsumeArea(params);
         this.goDownComponent.parseTotal(response1, vo);
         if(params.getChannel() != null && params.getChannel() == 1 && params.getLevel().intValue() == levelVo.getLevel()){
@@ -194,7 +194,7 @@ public class ConsumeStructureController {
         }
         vo.setPage(this.goDownComponent.parseData(pageServiceResponse.getResult(), params.getChannel(), params.getEnterpriseId(), params.getLevel(), maxLevel));
         params.setCountType(2);
-        goDownComponent.setValueTotal(params, levelVo);
+        goDownComponent.setValueTotalForArea(params, levelVo);
         ServiceResponse<Page<BirthConsumeAreaDTO>> response1 = consumeStructureApiService.pageBirthConsumeArea(params);
         this.goDownComponent.parseTotal(response1, vo);
         if(params.getChannel() != null && params.getChannel() == 1 && params.getLevel().intValue() == levelVo.getLevel()){
@@ -250,7 +250,7 @@ public class ConsumeStructureController {
         }
         vo.setPage(this.goDownComponent.parseData(pageServiceResponse.getResult(), params.getChannel(), params.getEnterpriseId(), params.getLevel(), maxLevel));
         params.setCountType(2);
-        goDownComponent.setValueTotal(params, levelVo);
+        goDownComponent.setValueTotalForArea(params, levelVo);
         ServiceResponse<Page<NewOldConsumeAreaDTO>> response1 = consumeStructureApiService.pageNewOldConsumeArea(params);
         this.goDownComponent.parseTotal(response1, vo);
         if(params.getChannel() != null && params.getChannel() == 1 && params.getLevel().intValue() == levelVo.getLevel()){
@@ -306,7 +306,7 @@ public class ConsumeStructureController {
         }
         vo.setPage(this.goDownComponent.parseData(pageServiceResponse.getResult(), params.getChannel(), params.getEnterpriseId(), params.getLevel(), maxLevel));
         params.setCountType(2);
-        goDownComponent.setValueTotal(params, levelVo);
+        goDownComponent.setValueTotalForArea(params, levelVo);
         ServiceResponse<Page<WhetherConsumeAreaDTO>> response1 = consumeStructureApiService.pageWhetherConsumeArea(params);
         this.goDownComponent.parseTotal(response1, vo);
         if(params.getChannel() != null && params.getChannel() == 1 && params.getLevel().intValue() == levelVo.getLevel()){

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

@@ -141,6 +141,21 @@ public class GoDownComponent {
         }
     }
 
+    public void setValueTotalForArea(AbstractCommonQo params, LevelVo levelVo){
+        /**所有渠道或者线下渠道第一层级 合计算上无归属数据**/
+        boolean isContainNoOwnership = (params.getChannel() == null || (StoreChannelEnum.OFFLINE.getChannel().equals(params.getChannel()) && params.getLevel().intValue() == levelVo.getLevel()));
+        if(isContainNoOwnership){
+            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");
+        }
+    }
+
     public void setValueTotal(AbstractCommonQo params){
         Integer wgs = storeSearchUtils.isWgs(params.getUserId(), params.getEnterpriseId(), params.getSearchJson());
         /**所有渠道或者线下渠道第一层级 合计算上无归属数据**/

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

@@ -83,7 +83,7 @@ public class MemberCloudDataController {
         }
         vo.setPage(this.goDownComponent.parseData(pageServiceResponse.getResult(), params.getChannel(), params.getEnterpriseId(), params.getLevel(), maxLevel));
         params.setCountType(2);
-        goDownComponent.setValueTotal(params, levelVo);
+        goDownComponent.setValueTotalForArea(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().intValue()){
@@ -113,7 +113,7 @@ public class MemberCloudDataController {
         }
         vo.setPage(this.goDownComponent.parseData(pageServiceResponse.getResult(), params.getChannel(), params.getEnterpriseId(), params.getLevel(), maxLevel));
         params.setCountType(2);
-        goDownComponent.setValueTotal(params, levelVo);
+        goDownComponent.setValueTotalForArea(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().intValue()){

gic-data-cloud-wxapp/src/main/resources/dubbo-gic-data-cloud-wxapp.xml

@@ -150,7 +150,7 @@
     <dubbo:reference interface="com.gic.cloud.service.FunctionModuleApiService" id="functionModuleApiService" timeout="6000" retries="0"/>
     <dubbo:reference interface="com.gic.cloud.service.EnterprisePortraitRelApiService" id="enterprisePortraitRelApiService" timeout="6000" retries="0"/>
     <dubbo:reference interface="com.gic.data.api.service.performanceoverview.PerformanceOverviewApiService" id="performanceOverviewApiService" timeout="6000" retries="0"/>
-    <dubbo:reference interface="com.gic.data.api.service.consumestructure.ConsumeStructureApiService" id="consumeStructureApiService" timeout="6000" retries="0"/>
+    <dubbo:reference interface="com.gic.data.api.service.consumestructure.ConsumeStructureApiService" id="consumeStructureApiService" timeout="60000" retries="0"/>
     <dubbo:reference interface="com.gic.data.api.service.BaseSalesApiService" id="baseSalesApiService" timeout="6000" retries="0"/>
     <dubbo:reference interface="com.gic.data.api.service.member.MemberCloudDataApiService" id="memberCloudDataApiService" timeout="6000" retries="0"/>
 </beans>