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
9fbde580
Commit
9fbde580
authored
Jul 20, 2020
by
ping.wu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
兼容门店隔日预约单格式修改,HH:mm变yyyy-MM-dd HH:mm,前端未升级,未按要求传
parent
1114f056
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
2 deletions
+6
-2
order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
+6
-2
No files found.
order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
View file @
9fbde580
...
...
@@ -343,7 +343,6 @@ public class CheckOrder {
}
}
public
Date
getOrderExpectTime
(
String
takeMealFlag
,
String
takeMealTimes
,
String
expectTime
,
CreateOrderType
createOrderType
,
Integer
serviceTime
,
StoreResponse
.
BizVO
storeResponseDto
){
Date
takeMealDateTime
=
null
;
...
...
@@ -354,9 +353,14 @@ public class CheckOrder {
if
(
StringUtils
.
isBlank
(
takeMealTimes
)
&&
StringUtils
.
isBlank
(
expectTime
))
{
return
takeMealDateTime
;
}
//兼容门店隔日预约单格式修改,HH:mm变yyyy-MM-dd HH:mm,前端未升级,未按要求传
if
(
StringUtils
.
isNotBlank
(
takeMealTimes
)
&&
takeMealTimes
.
length
()
>
5
)
{
expectTime
=
takeMealTimes
+
":00"
;
}
Date
date
=
new
Date
();
if
(
StringUtils
.
isNotBlank
(
takeMealTimes
))
{
//takeMealTimes格式必须为HH:mm
if
(
StringUtils
.
isNotBlank
(
takeMealTimes
)
&&
takeMealTimes
.
length
()
==
5
)
{
StringBuffer
takeMealTime
=
new
StringBuffer
(
""
);
takeMealTime
=
takeMealTime
.
append
(
DateUtil
.
convert2String
(
date
,
"yyyy-MM-dd"
))
.
append
(
" "
).
append
(
takeMealTimes
).
append
(
":00"
);
...
...
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