Commit 39d56dbd by xiaoer.li@freemud.com

新增值返回的就是时间 跳过枚举

parent b104d5bb
...@@ -862,7 +862,8 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService { ...@@ -862,7 +862,8 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
if (configuration != null ) { if (configuration != null ) {
if(configuration.getDeliveryFinishedAfterMinute()>0){ if(configuration.getDeliveryFinishedAfterMinute()>0){
timeOut = isTakeOut ? takeOutTimeOut timeOut = isTakeOut ? takeOutTimeOut
: AutoOrderConfigTime.getTime(configuration.getDeliveryFinishedAfterMinute().toString()); //: AutoOrderConfigTime.getTime(configuration.getDeliveryFinishedAfterMinute().toString());
: configuration.getDeliveryFinishedAfterMinute();
//request.setTimeout(timeOut); //request.setTimeout(timeOut);
} }
if(StringUtils.isNotEmpty(baseQueryOrderRequest.getExpectTime()) && StringUtils.isNotEmpty(configuration.getAppointAutoDeliveryTakeOrderWorkflowFinishTime())){ if(StringUtils.isNotEmpty(baseQueryOrderRequest.getExpectTime()) && StringUtils.isNotEmpty(configuration.getAppointAutoDeliveryTakeOrderWorkflowFinishTime())){
...@@ -1889,14 +1890,16 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService { ...@@ -1889,14 +1890,16 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
//自配送外卖单接单后自动流程时间 //自配送外卖单接单后自动流程时间
if (configuration.getDeliveryProcessingAfterMinute()>0) { if (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()
: takeOutTimeOut; : takeOutTimeOut;
} }
//预约单 //预约单
if(OrderType.RESERVED_EXPRESS.equals(baseQueryOrderRequest.getOrderType()) if(OrderType.RESERVED_EXPRESS.equals(baseQueryOrderRequest.getOrderType())
&& configuration.getDeliveryProcessingBeforeMinute()>0){ && configuration.getDeliveryProcessingBeforeMinute()>0){
timeout = QueryDeliveryType.SELF.getCode().equals(baseQueryOrderRequest.getDeliveryType()) timeout = QueryDeliveryType.SELF.getCode().equals(baseQueryOrderRequest.getDeliveryType())
? AutoOrderConfigTime.getTime(configuration.getDeliveryProcessingBeforeMinute().toString()) //? AutoOrderConfigTime.getTime(configuration.getDeliveryProcessingBeforeMinute().toString())
? configuration.getDeliveryProcessingBeforeMinute()
: takeOutTimeOut; : takeOutTimeOut;
} }
} }
......
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