Merge branch '20201127_coco配送进程' into qa

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -1223,6 +1223,7 @@ public class OrderAdapter {
             if (ordersBean.getDeliverStatus() != null) {
                 responseVo.setHasThirdDelivery(true);
             }
+            responseVo.setDeliveryStatus(ordersBean.getDeliverStatus());
             responseVo.setQueueIndex(ordersBean.getQueueIndex());
             responseVo.setButtonRefund(orderViewStatusDto.getButtonRefund());
             responseVo.setButtonContactPartner(orderViewStatusDto.getButtonContactPartner());

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

@@ -310,6 +310,10 @@ public class QueryOrderResponseVo {
      * 是否是第三方配送单
      */
     private Boolean hasThirdDelivery;
+    /**
+     * 配送状态
+     */
+    private Integer deliveryStatus;
 
     /**
      * 骑手名称 商家自配送名称