骑手信息新增订单配送类型

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

@@ -1870,7 +1870,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
                     timeout = AutoOrderConfigTime.getTime(configuration.getAutoTakeOutTakeOrderWorkflowFinishTime());
                 }
                 //预约单
-                if(OrderType.RESERVED_EXPRESS.equals(baseQueryOrderRequest.getOrderType())
+                if(configuration.getDeliveryProcessingBeforeMinute()!=null && OrderType.RESERVED_EXPRESS.equals(baseQueryOrderRequest.getOrderType())
                         && StringUtils.isNotEmpty(configuration.getAppointAutoTakeOutTakeOrderWorkflowFinishTime())){
                     timeout = AutoOrderConfigTime.getTime(configuration.getAppointAutoTakeOutTakeOrderWorkflowFinishTime());
                 }

order-application-service/src/main/java/cn/freemud/entities/vo/OrderRiderResponseVo.java

@@ -82,12 +82,18 @@ public class OrderRiderResponseVo {
     /**
      * 骑手姓名
      */
-    private String RiderName;
+    private String riderName;
 
     /**
      * 骑手电话
      */
-    private String RiderPhone;
+    private String riderPhone;
+
+    /**
+     * 配送类型 1自配送(三方渠道配送、商家店员配送) 2平台配送
+     */
+    private Integer expressType;
+
     @Data
     public static class Operation{
         private String createTime;

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -1340,6 +1340,7 @@ public class OrderServiceImpl implements Orderservice {
         responseVo.setStorePhone(deliveryBaseResponse.getData().getStorePhone());
         responseVo.setRiderName(deliveryBaseResponse.getData().getRiderName());
         responseVo.setRiderPhone(deliveryBaseResponse.getData().getRiderPhone());
+        responseVo.setExpressType(orderBean.getExpressType());
         if (deliveryBaseResponse.getData().getCurrentPoint() != null) {
             String[] currentPoint = deliveryBaseResponse.getData().getCurrentPoint().split(",");
             responseVo.setRiderLongitude(currentPoint[0]);