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
a98a9032
Commit
a98a9032
authored
Jan 19, 2021
by
xiaoer.li@freemud.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
3->1
parent
d6c1d2bc
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
+2
-2
No files found.
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
View file @
a98a9032
...
@@ -851,7 +851,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
...
@@ -851,7 +851,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
request
.
setOperator
(
baseQueryOrderRequest
.
getOperator
());
request
.
setOperator
(
baseQueryOrderRequest
.
getOperator
());
Boolean
isTakeOut
=
false
;
Boolean
isTakeOut
=
false
;
Integer
timeOut
=
0
;
Integer
timeOut
=
0
;
Integer
takeOutTimeOut
=
Integer
.
parseInt
(
String
.
valueOf
(
TimeUnit
.
HOURS
.
toMinutes
(
3
)));
Integer
takeOutTimeOut
=
Integer
.
parseInt
(
String
.
valueOf
(
TimeUnit
.
HOURS
.
toMinutes
(
1
)));
//是saas 外卖单 且是三方配送 调用门店服务查询外卖单自动完成时间
//是saas 外卖单 且是三方配送 调用门店服务查询外卖单自动完成时间
if
((
OrderType
.
GENERAL_EXPRESS
.
equals
(
baseQueryOrderRequest
.
getOrderType
())
if
((
OrderType
.
GENERAL_EXPRESS
.
equals
(
baseQueryOrderRequest
.
getOrderType
())
||
OrderType
.
RESERVED_EXPRESS
.
equals
(
baseQueryOrderRequest
.
getOrderType
()))
||
OrderType
.
RESERVED_EXPRESS
.
equals
(
baseQueryOrderRequest
.
getOrderType
()))
...
@@ -1874,7 +1874,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
...
@@ -1874,7 +1874,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
String
orderWarnTime
=
storeResponse
.
getBizVO
().
getOrderWarnTime
();
String
orderWarnTime
=
storeResponse
.
getBizVO
().
getOrderWarnTime
();
Integer
timeout
=
0
;
Integer
timeout
=
0
;
Boolean
isTakeOut
=
false
;
Boolean
isTakeOut
=
false
;
Integer
takeOutTimeOut
=
Integer
.
parseInt
(
String
.
valueOf
(
TimeUnit
.
HOURS
.
toMinutes
(
3
)));
Integer
takeOutTimeOut
=
Integer
.
parseInt
(
String
.
valueOf
(
TimeUnit
.
HOURS
.
toMinutes
(
1
)));
//是saas 外卖单 且是三方配送
//是saas 外卖单 且是三方配送
if
((
OrderType
.
GENERAL_EXPRESS
.
equals
(
baseQueryOrderRequest
.
getOrderType
())
if
((
OrderType
.
GENERAL_EXPRESS
.
equals
(
baseQueryOrderRequest
.
getOrderType
())
||
OrderType
.
RESERVED_EXPRESS
.
equals
(
baseQueryOrderRequest
.
getOrderType
()))
||
OrderType
.
RESERVED_EXPRESS
.
equals
(
baseQueryOrderRequest
.
getOrderType
()))
...
...
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