Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
order-group
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
order-group-application
order-group
Commits
e4a46471
Commit
e4a46471
authored
Aug 01, 2020
by
xiaoer.li@freemud.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'remotes/origin/202007131400' into qa
parents
ea7efcb8
fe3c7478
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 additions
and
1 deletions
+1
-1
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+1
-1
No files found.
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
View file @
e4a46471
...
...
@@ -2419,7 +2419,7 @@ public class OrderServiceImpl implements Orderservice {
OrderConditionsReq
orderConditionsReq
=
new
OrderConditionsReq
();
BeanUtil
.
convertBean
(
queryOrderByConditionsRequestVo
,
orderConditionsReq
);
orderConditionsReq
.
setUserId
(
userId
);
Date
startDate
=
DateUtil
.
convert2Date
(
DateUtil
.
addDays
(
new
Date
(),-
28
)
,
DateUtil
.
FORMAT_YYYY_MM_DD_HHMMSS
);
Date
startDate
=
DateUtil
.
convert2Date
(
"2020-08-01 00:00:00"
,
DateUtil
.
FORMAT_YYYY_MM_DD_HHMMSS
);
orderConditionsReq
.
setStartTimestamp
(
startDate
.
getTime
()/
1000
);
orderConditionsReq
.
setEndTimestamp
(
new
Date
().
getTime
()/
1000
);
BaseDownLoadResponse
<
List
<
OrderInfoReqs
>>
orderInfoReqs
=
orderDownLoadSdkService
.
queryOrderByConditions
(
orderConditionsReq
,
LogTreadLocal
.
getTrackingNo
());
...
...
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