Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform
Project
Project
Details
Activity
Releases
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
youjj
cloud-platform
Commits
5b25fd1a
Commit
5b25fd1a
authored
Oct 14, 2019
by
hanfeng
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master-order-statistics' into dev
parents
af858884
e9b827bd
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
OrderStatisticsController.java
...form/order/rest/background/OrderStatisticsController.java
+2
-2
No files found.
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/background/OrderStatisticsController.java
View file @
5b25fd1a
...
@@ -160,7 +160,7 @@ public class OrderStatisticsController extends BaseController<OrderStatisticsBiz
...
@@ -160,7 +160,7 @@ public class OrderStatisticsController extends BaseController<OrderStatisticsBiz
@ApiOperation
(
value
=
"会员统计"
)
@ApiOperation
(
value
=
"会员统计"
)
public
ObjectRestResponse
<
List
<
MembersOrderDto
>>
getMemberOrderStatisticsData
(
@RequestBody
OrderQuery
query
)
throws
ParseException
{
public
ObjectRestResponse
<
List
<
MembersOrderDto
>>
getMemberOrderStatisticsData
(
@RequestBody
OrderQuery
query
)
throws
ParseException
{
if
(
query
.
getEndTime
()!=
null
)
{
if
(
query
.
getEndTime
()!=
null
)
{
query
.
setEndTime
(
query
.
get
Start
Time
()+(
24
*
60
*
60
*
1000
));
query
.
setEndTime
(
query
.
get
End
Time
()+(
24
*
60
*
60
*
1000
));
}
}
//获取会员等级信息
//获取会员等级信息
List
<
BaseUserMemberLevel
>
memberLevels
=
userFeign
.
levels
();
List
<
BaseUserMemberLevel
>
memberLevels
=
userFeign
.
levels
();
...
@@ -173,7 +173,7 @@ public class OrderStatisticsController extends BaseController<OrderStatisticsBiz
...
@@ -173,7 +173,7 @@ public class OrderStatisticsController extends BaseController<OrderStatisticsBiz
@ApiOperation
(
value
=
"下载excel表"
)
@ApiOperation
(
value
=
"下载excel表"
)
public
void
downloadExcel
(
@RequestBody
OrderQuery
query
)
throws
Exception
{
public
void
downloadExcel
(
@RequestBody
OrderQuery
query
)
throws
Exception
{
if
(
query
.
getEndTime
()!=
null
)
{
if
(
query
.
getEndTime
()!=
null
)
{
query
.
setEndTime
(
query
.
get
Start
Time
()+(
24
*
60
*
60
*
1000
));
query
.
setEndTime
(
query
.
get
End
Time
()+(
24
*
60
*
60
*
1000
));
}
}
// 通过工具类创建writer,默认创建xls格式
// 通过工具类创建writer,默认创建xls格式
ExcelWriter
writer
=
ExcelUtil
.
getWriter
(
true
);
ExcelWriter
writer
=
ExcelUtil
.
getWriter
(
true
);
...
...
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