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
66178507
Commit
66178507
authored
Mar 01, 2021
by
xiaoer.li
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add:判空
parent
96761ccf
Hide 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 @
66178507
...
@@ -860,7 +860,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
...
@@ -860,7 +860,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
}
}
StoreResponse
.
Configuration
configuration
=
getStoreAutoConfiguration
(
baseQueryOrderRequest
.
getPartnerId
(),
baseQueryOrderRequest
.
getShopId
(),
baseQueryOrderRequest
.
getTrackingNo
());
StoreResponse
.
Configuration
configuration
=
getStoreAutoConfiguration
(
baseQueryOrderRequest
.
getPartnerId
(),
baseQueryOrderRequest
.
getShopId
(),
baseQueryOrderRequest
.
getTrackingNo
());
if
(
configuration
!=
null
)
{
if
(
configuration
!=
null
)
{
if
(
configuration
.
getDeliveryFinishedAfterMinute
()>
0
){
if
(
configuration
.
getDeliveryFinishedAfterMinute
()
!=
null
&&
configuration
.
getDeliveryFinishedAfterMinute
()
>
0
){
timeOut
=
isTakeOut
?
takeOutTimeOut
timeOut
=
isTakeOut
?
takeOutTimeOut
//: AutoOrderConfigTime.getTime(configuration.getDeliveryFinishedAfterMinute().toString());
//: AutoOrderConfigTime.getTime(configuration.getDeliveryFinishedAfterMinute().toString());
:
configuration
.
getDeliveryFinishedAfterMinute
();
:
configuration
.
getDeliveryFinishedAfterMinute
();
...
@@ -1888,7 +1888,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
...
@@ -1888,7 +1888,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
// 重要的事情重复三遍 saas 实时外卖 预约外卖都是 按3个小时流转
// 重要的事情重复三遍 saas 实时外卖 预约外卖都是 按3个小时流转
if
(
OrderType
.
GENERAL_EXPRESS
.
equals
(
baseQueryOrderRequest
.
getOrderType
())
||
OrderType
.
RESERVED_EXPRESS
.
equals
(
baseQueryOrderRequest
.
getOrderType
()))
{
if
(
OrderType
.
GENERAL_EXPRESS
.
equals
(
baseQueryOrderRequest
.
getOrderType
())
||
OrderType
.
RESERVED_EXPRESS
.
equals
(
baseQueryOrderRequest
.
getOrderType
()))
{
//自配送外卖单接单后自动流程时间
//自配送外卖单接单后自动流程时间
if
(
configuration
.
getDeliveryProcessingAfterMinute
()>
0
)
{
if
(
configuration
.
getDeliveryProcessingAfterMinute
()
!=
null
&&
configuration
.
getDeliveryProcessingAfterMinute
()
>
0
)
{
timeout
=
QueryDeliveryType
.
SELF
.
getCode
().
equals
(
baseQueryOrderRequest
.
getDeliveryType
())
timeout
=
QueryDeliveryType
.
SELF
.
getCode
().
equals
(
baseQueryOrderRequest
.
getDeliveryType
())
//? AutoOrderConfigTime.getTime(configuration.getDeliveryProcessingAfterMinute().toString())
//? AutoOrderConfigTime.getTime(configuration.getDeliveryProcessingAfterMinute().toString())
?
configuration
.
getDeliveryProcessingAfterMinute
()
?
configuration
.
getDeliveryProcessingAfterMinute
()
...
...
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