Commit 18c13e94 by ping.wu

预约单提醒时间区分外卖单和自提单

parent d50bf75f
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
<dependency> <dependency>
<groupId>com.freemud.application.service.sdk</groupId> <groupId>com.freemud.application.service.sdk</groupId>
<artifactId>storecenter-sdk</artifactId> <artifactId>storecenter-sdk</artifactId>
<version>2.3.3-SNAPSHOT</version> <version>2.8.RELEASE</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
......
...@@ -1425,10 +1425,10 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService { ...@@ -1425,10 +1425,10 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
|| OrderType.RESERVED_DINE_IN.equals(baseQueryOrderRequest.getOrderType()) || OrderType.RESERVED_DINE_IN.equals(baseQueryOrderRequest.getOrderType())
|| OrderType.RESERVED_SELF_PICKUP.equals(baseQueryOrderRequest.getOrderType())){ || OrderType.RESERVED_SELF_PICKUP.equals(baseQueryOrderRequest.getOrderType())){
//外卖预约单 //外卖预约单
// if(OrderType.RESERVED_EXPRESS.equals(baseQueryOrderRequest.getOrderType()) && if(OrderType.RESERVED_EXPRESS.equals(baseQueryOrderRequest.getOrderType()) &&
// configuration != null && configuration.getDeliveryOrderWarnTime() != null){ configuration != null && configuration.getDeliveryOrderWarnTime() != null){
// orderWarnTime = configuration.getDeliveryOrderWarnTime(); orderWarnTime = configuration.getDeliveryOrderWarnTime();
// } }
OrderTaskReq orderTask = new OrderTaskReq(); OrderTaskReq orderTask = new OrderTaskReq();
orderTask.setTaskType(3); orderTask.setTaskType(3);
Date processingDate = DateUtil.addMinutes(DateUtil.convert2Date(baseQueryOrderRequest.getExpectTime(), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS), -getMinTime(orderWarnTime)); Date processingDate = DateUtil.addMinutes(DateUtil.convert2Date(baseQueryOrderRequest.getExpectTime(), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS), -getMinTime(orderWarnTime));
......
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