- 自建外卖订单，商家自配送 45分钟 后，订单状态自动更改为【已完成】 deliveryFinishedAfterMinute

- 自建外卖订单，商家自配送，门店接单   10分钟后，订单状态自动更改为【配送中】deliveryProcessingAfterMinute
- 预约自建外卖订单，商家自配送，预约时间前  15分钟  订单状态更改为【配送中】deliveryProcessingBeforeMinute

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>2.1.19.20210117-RELEASE</version>
+    <version>2.1.19.20210118-RELEASE</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>storecenter-sdk</artifactId>
-            <version>3.1.9.RELEASE</version>
+            <version>3.3.8-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java

@@ -860,9 +860,9 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         }
         StoreResponse.Configuration configuration = getStoreAutoConfiguration(baseQueryOrderRequest.getPartnerId(), baseQueryOrderRequest.getShopId(), baseQueryOrderRequest.getTrackingNo());
         if (configuration != null ) {
-            if(StringUtils.isNotEmpty(configuration.getAutoDeliveryTakeOrderWorkflowFinishTime())){
+            if(configuration.getDeliveryFinishedAfterMinute()>0){
                 timeOut = isTakeOut ? takeOutTimeOut
-                                    : AutoOrderConfigTime.getTime(configuration.getAutoDeliveryTakeOrderWorkflowFinishTime());
+                                    : AutoOrderConfigTime.getTime(configuration.getDeliveryFinishedAfterMinute().toString());
                 //request.setTimeout(timeOut);
             }
             if(StringUtils.isNotEmpty(baseQueryOrderRequest.getExpectTime()) && StringUtils.isNotEmpty(configuration.getAppointAutoDeliveryTakeOrderWorkflowFinishTime())){
@@ -1887,16 +1887,16 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
             // 重要的事情重复三遍 saas 实时外卖  预约外卖都是 按3个小时流转
             if (OrderType.GENERAL_EXPRESS.equals(baseQueryOrderRequest.getOrderType()) || OrderType.RESERVED_EXPRESS.equals(baseQueryOrderRequest.getOrderType())) {
                 //自配送外卖单接单后自动流程时间
-                if (StringUtils .isNotEmpty(configuration.getAutoTakeOutTakeOrderWorkflowFinishTime())) {
+                if (configuration.getDeliveryProcessingAfterMinute()>0) {
                     timeout = QueryDeliveryType.SELF.getCode().equals(baseQueryOrderRequest.getDeliveryType())
-                            ? AutoOrderConfigTime.getTime(configuration.getAutoTakeOutTakeOrderWorkflowFinishTime())
+                            ? AutoOrderConfigTime.getTime(configuration.getDeliveryProcessingAfterMinute().toString())
                             : takeOutTimeOut;
                 }
                 //预约单
                 if(OrderType.RESERVED_EXPRESS.equals(baseQueryOrderRequest.getOrderType())
-                        && StringUtils.isNotEmpty(configuration.getAppointAutoTakeOutTakeOrderWorkflowFinishTime())){
+                        &&  configuration.getDeliveryProcessingBeforeMinute()>0){
                     timeout = QueryDeliveryType.SELF.getCode().equals(baseQueryOrderRequest.getDeliveryType())
-                              ? AutoOrderConfigTime.getTime(configuration.getAppointAutoTakeOutTakeOrderWorkflowFinishTime())
+                              ? AutoOrderConfigTime.getTime(configuration.getDeliveryProcessingBeforeMinute().toString())
                               : takeOutTimeOut;
                 }
             }

order-management/pom.xml

@@ -65,7 +65,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>2.1.19.20210117-RELEASE</version>
+            <version>2.1.19.20210118-RELEASE</version>
             <scope>provided</scope>
         </dependency>
         <dependency>