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
3c198cd5
Commit
3c198cd5
authored
Aug 17, 2020
by
陶光胜
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
观云台小程序
parent
61dd32e3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
17 deletions
+13
-17
BaseSalesController.java
...ava/com/gic/cloud/web/controller/BaseSalesController.java
+13
-17
No files found.
gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/BaseSalesController.java
View file @
3c198cd5
...
...
@@ -88,26 +88,22 @@ public class BaseSalesController {
ServiceResponse
<
Page
<
BaseSalesDTO
>>
response
=
this
.
baseSalesApiService
.
pageBaseSales
(
dto
);
vo
.
setPage
(
this
.
goDownComponent
.
parseData
(
response
.
getResult
(),
qo
.
getChannel
(),
qo
.
getEnterpriseId
(),
qo
.
getLevel
(),
maxLevel
));
dto
.
setCountType
(
2
);
//合计
ServiceResponse
<
Page
<
BaseSalesDTO
>>
response1
=
this
.
baseSalesApiService
.
pageBaseSales
(
dto
);
if
(
response1
.
isSuccess
()
&&
response1
.
getResult
()
!=
null
&&
CollectionUtils
.
isNotEmpty
(
response1
.
getResult
().
getResult
())){
BaseSalesDTO
total
=
response1
.
getResult
().
getResult
().
get
(
0
);
if
(
total
!=
null
){
total
.
setId
(
"0"
);
total
.
setName
(
"合计"
);
vo
.
setTotal
(
total
);
}
/**所有渠道或者线下渠道第一层级 合计算上无归属数据**/
if
(
qo
.
getChannel
()
==
null
||
(
qo
.
getChannel
()
==
StoreChannelEnum
.
OFFLINE
.
getChannel
()
&&
qo
.
getLevel
()
==
levelVo
.
getLevel
())){
dto
.
getStoreInfoIdList
().
add
(-
1
);
dto
.
getOnLine
().
add
(
"-1"
);
}
ServiceResponse
<
Page
<
BaseSalesDTO
>>
totalResponse
=
this
.
baseSalesApiService
.
pageBaseSales
(
dto
);
this
.
goDownComponent
.
parseTotal
(
totalResponse
,
vo
);
if
(
qo
.
getChannel
()
!=
null
&&
qo
.
getChannel
()
==
1
&&
qo
.
getLevel
()
==
levelVo
.
getLevel
()){
dto
.
setCountType
(
3
);
//无归属
ServiceResponse
<
Page
<
BaseSalesDTO
>>
response2
=
this
.
baseSalesApiService
.
pageBaseSales
(
dto
);
if
(
response2
.
isSuccess
()
&&
response2
.
getResult
()
!=
null
&&
CollectionUtils
.
isNotEmpty
(
response2
.
getResult
().
getResult
())){
BaseSalesDTO
wgs
=
response2
.
getResult
().
getResult
().
get
(
0
);
if
(
wgs
!=
null
){
wgs
.
setName
(
"无归属"
);
wgs
.
setId
(
"-1"
);
vo
.
setWgs
(
wgs
);
}
}
dto
.
setChannel
(
null
);
dto
.
getStoreInfoIdList
().
clear
();
dto
.
getOnLine
().
clear
();
dto
.
getStoreInfoIdList
().
add
(-
1
);
dto
.
getOnLine
().
add
(
"-1"
);
ServiceResponse
<
Page
<
BaseSalesDTO
>>
wgsResponse
=
this
.
baseSalesApiService
.
pageBaseSales
(
dto
);
this
.
goDownComponent
.
parseWgs
(
wgsResponse
,
vo
);
}
return
RestResponse
.
success
(
vo
);
}
...
...
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