Merge branch 'developer' into 'master'

Developer

See merge request !25

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

@@ -79,6 +79,9 @@ public class ConsumeStructureController {
         Integer maxLevel = levelVo.getMaxLevel();
         params.setCountType(1);
         ServiceResponse<Page<AgeConsumeAreaDTO>> pageServiceResponse = consumeStructureApiService.pageAgeConsumeArea(params);
+        if (!pageServiceResponse.isSuccess()) {
+            return RestResponse.failure(pageServiceResponse.getCode(), pageServiceResponse.getMessage());
+        }
         vo.setPage(this.goDownComponent.parseData(pageServiceResponse.getResult(), params.getChannel(), params.getEnterpriseId(), params.getLevel(), maxLevel));
         params.setCountType(2);
         ServiceResponse<Page<AgeConsumeAreaDTO>> response1 = consumeStructureApiService.pageAgeConsumeArea(params);
@@ -116,6 +119,9 @@ public class ConsumeStructureController {
         Integer maxLevel = levelVo.getMaxLevel();
         params.setCountType(1);
         ServiceResponse<Page<GradeConsumeAreaDTO>> pageServiceResponse = consumeStructureApiService.pageGradeConsumeArea(params);
+        if (!pageServiceResponse.isSuccess()) {
+            return RestResponse.failure(pageServiceResponse.getCode(), pageServiceResponse.getMessage());
+        }
         vo.setPage(this.goDownComponent.parseData(pageServiceResponse.getResult(), params.getChannel(), params.getEnterpriseId(), params.getLevel(), maxLevel));
         params.setCountType(2);
         ServiceResponse<Page<GradeConsumeAreaDTO>> response1 = consumeStructureApiService.pageGradeConsumeArea(params);
@@ -169,6 +175,9 @@ public class ConsumeStructureController {
         Integer maxLevel = levelVo.getMaxLevel();
         params.setCountType(1);
         ServiceResponse<Page<BirthConsumeAreaDTO>> pageServiceResponse = consumeStructureApiService.pageBirthConsumeArea(params);
+        if (!pageServiceResponse.isSuccess()) {
+            return RestResponse.failure(pageServiceResponse.getCode(), pageServiceResponse.getMessage());
+        }
         vo.setPage(this.goDownComponent.parseData(pageServiceResponse.getResult(), params.getChannel(), params.getEnterpriseId(), params.getLevel(), maxLevel));
         params.setCountType(2);
         ServiceResponse<Page<BirthConsumeAreaDTO>> response1 = consumeStructureApiService.pageBirthConsumeArea(params);
@@ -216,6 +225,9 @@ public class ConsumeStructureController {
         Integer maxLevel = levelVo.getMaxLevel();
         params.setCountType(1);
         ServiceResponse<Page<NewOldConsumeAreaDTO>> pageServiceResponse = consumeStructureApiService.pageNewOldConsumeArea(params);
+        if (!pageServiceResponse.isSuccess()) {
+            return RestResponse.failure(pageServiceResponse.getCode(), pageServiceResponse.getMessage());
+        }
         vo.setPage(this.goDownComponent.parseData(pageServiceResponse.getResult(), params.getChannel(), params.getEnterpriseId(), params.getLevel(), maxLevel));
         params.setCountType(2);
         ServiceResponse<Page<NewOldConsumeAreaDTO>> response1 = consumeStructureApiService.pageNewOldConsumeArea(params);
@@ -263,12 +275,16 @@ public class ConsumeStructureController {
         Integer maxLevel = levelVo.getMaxLevel();
         params.setCountType(1);
         ServiceResponse<Page<WhetherConsumeAreaDTO>> pageServiceResponse = consumeStructureApiService.pageWhetherConsumeArea(params);
+        if (!pageServiceResponse.isSuccess()) {
+            return RestResponse.failure(pageServiceResponse.getCode(), pageServiceResponse.getMessage());
+        }
         vo.setPage(this.goDownComponent.parseData(pageServiceResponse.getResult(), params.getChannel(), params.getEnterpriseId(), params.getLevel(), maxLevel));
         params.setCountType(2);
         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); //无归属
+            //无归属
+            params.setCountType(3);
             ServiceResponse<Page<WhetherConsumeAreaDTO>> response2 = consumeStructureApiService.pageWhetherConsumeArea(params);
             this.goDownComponent.parseWgs(response2, vo);
         }

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

@@ -66,6 +66,9 @@ public class MemberCloudDataController {
         Integer maxLevel = levelVo.getMaxLevel();
         params.setCountType(1);
         ServiceResponse<Page<MemberDistributionAreaDTO>> pageServiceResponse = memberCloudDataApiService.pageMemberDistributionArea(params);
+        if (!pageServiceResponse.isSuccess()) {
+            return RestResponse.failure(pageServiceResponse.getCode(), pageServiceResponse.getMessage());
+        }
         vo.setPage(this.goDownComponent.parseData(pageServiceResponse.getResult(), params.getChannel(), params.getEnterpriseId(), params.getLevel(), maxLevel));
         params.setCountType(2);
         ServiceResponse<Page<MemberDistributionAreaDTO>> response1 = memberCloudDataApiService.pageMemberDistributionArea(params);
@@ -88,6 +91,9 @@ public class MemberCloudDataController {
         Integer maxLevel = levelVo.getMaxLevel();
         params.setCountType(1);
         ServiceResponse<Page<MemberRecruitAreaDTO>> pageServiceResponse = memberCloudDataApiService.pageMemberRecruitArea(params);
+        if (!pageServiceResponse.isSuccess()) {
+            return RestResponse.failure(pageServiceResponse.getCode(), pageServiceResponse.getMessage());
+        }
         vo.setPage(this.goDownComponent.parseData(pageServiceResponse.getResult(), params.getChannel(), params.getEnterpriseId(), params.getLevel(), maxLevel));
         params.setCountType(2);
         ServiceResponse<Page<MemberRecruitAreaDTO>> response1 = memberCloudDataApiService.pageMemberRecruitArea(params);