Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gic-data-cloud
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
base_platform_enterprise
gic-data-cloud
Commits
f1791f5b
Commit
f1791f5b
authored
Aug 25, 2020
by
guojuxing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
区域调整:如果错误,抛出错误
parent
de2c29ab
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
1 deletions
+23
-1
ConsumeStructureController.java
.../gic/cloud/web/controller/ConsumeStructureController.java
+17
-1
MemberCloudDataController.java
...m/gic/cloud/web/controller/MemberCloudDataController.java
+6
-0
No files found.
gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/ConsumeStructureController.java
View file @
f1791f5b
...
...
@@ -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
View file @
f1791f5b
...
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment