Merge branch 'developer' into 'master'

Developer

See merge request !58

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

@@ -90,7 +90,7 @@ public class ConsumeStructureController {
         if(params.getChannel() != null && params.getChannel() == 1 && params.getLevel().intValue() == levelVo.getLevel()){
             //无归属
             params.setCountType(3);
-            goDownComponent.setValueWgs(params, levelVo);
+            goDownComponent.setValueWgsForArea(params, levelVo);
             ServiceResponse<Page<AgeConsumeAreaDTO>> response2 = consumeStructureApiService.pageAgeConsumeArea(params);
             this.goDownComponent.parseWgs(response2, vo);
         }
@@ -136,7 +136,7 @@ public class ConsumeStructureController {
         if(params.getChannel() != null && params.getChannel() == 1 && params.getLevel().intValue() == levelVo.getLevel()){
             params.setCountType(3);
             //无归属
-            goDownComponent.setValueWgs(params, levelVo);
+            goDownComponent.setValueWgsForArea(params, levelVo);
             ServiceResponse<Page<GradeConsumeAreaDTO>> response2 = consumeStructureApiService.pageGradeConsumeArea(params);
             this.goDownComponent.parseWgs(response2, vo);
         }
@@ -200,7 +200,7 @@ public class ConsumeStructureController {
         if(params.getChannel() != null && params.getChannel() == 1 && params.getLevel().intValue() == levelVo.getLevel()){
             params.setCountType(3);
             //无归属
-            goDownComponent.setValueWgs(params, levelVo);
+            goDownComponent.setValueWgsForArea(params, levelVo);
             ServiceResponse<Page<BirthConsumeAreaDTO>> response2 = consumeStructureApiService.pageBirthConsumeArea(params);
             this.goDownComponent.parseWgs(response2, vo);
         }
@@ -256,7 +256,7 @@ public class ConsumeStructureController {
         if(params.getChannel() != null && params.getChannel() == 1 && params.getLevel().intValue() == levelVo.getLevel()){
             params.setCountType(3);
             //无归属
-            goDownComponent.setValueWgs(params, levelVo);
+            goDownComponent.setValueWgsForArea(params, levelVo);
             ServiceResponse<Page<NewOldConsumeAreaDTO>> response2 = consumeStructureApiService.pageNewOldConsumeArea(params);
             this.goDownComponent.parseWgs(response2, vo);
         }
@@ -312,7 +312,7 @@ public class ConsumeStructureController {
         if(params.getChannel() != null && params.getChannel() == 1 && params.getLevel().intValue() == levelVo.getLevel()){
             //无归属
             params.setCountType(3);
-            goDownComponent.setValueWgs(params, levelVo);
+            goDownComponent.setValueWgsForArea(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

@@ -173,6 +173,22 @@ public class GoDownComponent {
         }
     }
 
+    public void setValueWgsForArea(AbstractCommonQo params, LevelVo levelVo){
+        if(params.getChannel() != null && params.getChannel() == 1 && params.getLevel() == levelVo.getLevel().intValue()){
+            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);
+            params.getOnlineStoreIdList().add("-1");
+        }
+    }
+
     public void setValueWgs(AbstractCommonQo params){
         Integer wgs = storeSearchUtils.isWgs(params.getUserId(), params.getEnterpriseId(), params.getSearchJson());
         if(wgs == 1){

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

@@ -87,7 +87,7 @@ public class MemberCloudDataController {
         if(params.getChannel() != null && params.getChannel() == 1 && params.getLevel() == levelVo.getLevel().intValue()){
             //无归属
             params.setCountType(3);
-            goDownComponent.setValueWgs(params, levelVo);
+            goDownComponent.setValueWgsForArea(params, levelVo);
             ServiceResponse<Page<MemberDistributionAreaDTO>> response2 = memberCloudDataApiService.pageMemberDistributionArea(params);
             this.goDownComponent.parseWgs(response2, vo);
         }
@@ -115,7 +115,7 @@ public class MemberCloudDataController {
         if(params.getChannel() != null && params.getChannel() == 1 && params.getLevel() == levelVo.getLevel().intValue()){
             //无归属
             params.setCountType(3);
-            goDownComponent.setValueWgs(params, levelVo);
+            goDownComponent.setValueWgsForArea(params, levelVo);
             ServiceResponse<Page<MemberRecruitAreaDTO>> response2 = memberCloudDataApiService.pageMemberRecruitArea(params);
             this.goDownComponent.parseWgs(response2, vo);
         }