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
1529e24a
Commit
1529e24a
authored
Aug 20, 2020
by
陶光胜
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
观云台小程序
parent
bd9c2fc0
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
0 deletions
+6
-0
BaseSalesController.java
...ava/com/gic/cloud/web/controller/BaseSalesController.java
+6
-0
No files found.
gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/BaseSalesController.java
View file @
1529e24a
...
...
@@ -22,6 +22,8 @@ import com.gic.mall.share.api.service.ShopApiService;
import
com.google.inject.internal.asm.
$Handle
;
import
org.apache.commons.collections.CollectionUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.logging.log4j.LogManager
;
import
org.apache.logging.log4j.Logger
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
...
...
@@ -30,6 +32,7 @@ import java.util.List;
@RestController
public
class
BaseSalesController
{
private
Logger
log
=
LogManager
.
getLogger
(
BaseSalesController
.
class
);
@Autowired
private
DataAuthUtils
dataAuthUtils
;
@Autowired
...
...
@@ -86,6 +89,7 @@ public class BaseSalesController {
dto
.
setPageNum
(
qo
.
getPageNum
());
dto
.
setPageSize
(
qo
.
getPageSize
());
ServiceResponse
<
Page
<
BaseSalesDTO
>>
response
=
this
.
baseSalesApiService
.
pageBaseSales
(
dto
);
log
.
info
(
"response:{}"
,
JSON
.
toJSONString
(
response
));
vo
.
setPage
(
this
.
goDownComponent
.
parseData
(
response
.
getResult
(),
qo
.
getChannel
(),
qo
.
getEnterpriseId
(),
qo
.
getLevel
(),
maxLevel
));
dto
.
setCountType
(
2
);
//合计
/**所有渠道或者线下渠道第一层级 合计算上无归属数据**/
...
...
@@ -94,6 +98,7 @@ public class BaseSalesController {
dto
.
getOnLine
().
add
(
"-1"
);
}
ServiceResponse
<
Page
<
BaseSalesDTO
>>
totalResponse
=
this
.
baseSalesApiService
.
pageBaseSales
(
dto
);
log
.
info
(
"totalResponse:{}"
,
JSON
.
toJSONString
(
totalResponse
));
this
.
goDownComponent
.
parseTotal
(
totalResponse
,
vo
);
if
(
qo
.
getChannel
()
!=
null
&&
qo
.
getChannel
()
==
1
&&
qo
.
getLevel
()
==
levelVo
.
getLevel
()){
dto
.
setCountType
(
3
);
//无归属
...
...
@@ -103,6 +108,7 @@ public class BaseSalesController {
dto
.
getStoreInfoIdList
().
add
(-
1
);
dto
.
getOnLine
().
add
(
"-1"
);
ServiceResponse
<
Page
<
BaseSalesDTO
>>
wgsResponse
=
this
.
baseSalesApiService
.
pageBaseSales
(
dto
);
log
.
info
(
"wgsResponse:{}"
,
JSON
.
toJSONString
(
wgsResponse
));
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