Commit 66178507 by xiaoer.li

Add:判空

parent 96761ccf
...@@ -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()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment