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
8e5b2004
Commit
8e5b2004
authored
Jan 27, 2021
by
zhiheng.zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
时间计算错误,前端给错字段了
parent
9d546c38
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 @
8e5b2004
...
@@ -957,7 +957,7 @@ public class OrderServiceImpl implements Orderservice {
...
@@ -957,7 +957,7 @@ public class OrderServiceImpl implements Orderservice {
}
}
pickUpTime
=
DateUtil
.
addMinutes
(
new
Date
(
orderBean
.
getGmtAccept
()),
totalSumTime
).
getTime
();
pickUpTime
=
DateUtil
.
addMinutes
(
new
Date
(
orderBean
.
getGmtAccept
()),
totalSumTime
).
getTime
();
Date
date
=
new
Date
(
pickUpTime
);
Date
date
=
new
Date
(
pickUpTime
);
returnWords
+=
",预计 "
+
date
.
getHours
()
+
":"
+
date
.
getMinutes
(
)
+
" 可取餐"
;
returnWords
+=
",预计 "
+
date
.
getHours
()
+
":"
+
(
String
.
valueOf
(
date
.
getMinutes
()).
length
()==
1
?
"0"
+(
String
.
valueOf
(
date
.
getMinutes
()))
:
date
.
getMinutes
()
)
+
" 可取餐"
;
//制餐进度(当前时间-接单时间)/总时长(制餐时长)x100%
//制餐进度(当前时间-接单时间)/总时长(制餐时长)x100%
BigDecimal
progressB
=
new
BigDecimal
(
DateUtil
.
diffMinute
(
new
Date
(
orderBean
.
getGmtAccept
()),
new
Date
())).
divide
(
new
BigDecimal
(
totalSumTime
),
2
,
BigDecimal
.
ROUND_HALF_UP
);
BigDecimal
progressB
=
new
BigDecimal
(
DateUtil
.
diffMinute
(
new
Date
(
orderBean
.
getGmtAccept
()),
new
Date
())).
divide
(
new
BigDecimal
(
totalSumTime
),
2
,
BigDecimal
.
ROUND_HALF_UP
);
progress
=
progressB
.
compareTo
(
new
BigDecimal
(
1
))
==
1
?
"100"
:
progressB
.
multiply
(
new
BigDecimal
(
100
)).
toString
();
progress
=
progressB
.
compareTo
(
new
BigDecimal
(
1
))
==
1
?
"100"
:
progressB
.
multiply
(
new
BigDecimal
(
100
)).
toString
();
...
...
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