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
67c9dd1a
Commit
67c9dd1a
authored
Jan 20, 2021
by
xiaoer.li@freemud.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:timeOut
parent
534649e2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
5 deletions
+4
-5
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
+2
-3
order-management/src/main/java/cn/freemud/management/service/handle/SaasOrderHandle.java
+2
-2
No files found.
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
View file @
67c9dd1a
...
...
@@ -3295,9 +3295,8 @@ public class OrderSdkAdapter {
}
public
BaseQueryOrderRequest
convert2wmDeliveryTimeOut
(
BaseQueryOrderRequest
orderConfirmRequest
,
long
timeOut
)
{
Integer
takeOutTimeOut
=
Integer
.
parseInt
(
String
.
valueOf
(
TimeUnit
.
HOURS
.
toMinutes
(
timeOut
)));
orderConfirmRequest
.
setTimeout
(
takeOutTimeOut
);
public
BaseQueryOrderRequest
convert2wmDeliveryTimeOut
(
BaseQueryOrderRequest
orderConfirmRequest
,
Integer
timeOut
)
{
orderConfirmRequest
.
setTimeout
(
timeOut
);
return
orderConfirmRequest
;
}
}
order-management/src/main/java/cn/freemud/management/service/handle/SaasOrderHandle.java
View file @
67c9dd1a
...
...
@@ -48,8 +48,8 @@ public class SaasOrderHandle {
@Autowired
private
OrderCenterSdkService
orderCenterSdkService
;
@Value
(
"${saasDeliveryTimeOut
:3
}"
)
private
long
wmDeliveryTimeOut
;
@Value
(
"${saasDeliveryTimeOut}"
)
private
Integer
wmDeliveryTimeOut
;
/**
* 确认接单
...
...
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