配送进程

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

@@ -1220,8 +1220,9 @@ public class OrderAdapter {
                 responseVo.setOidBase64Image(oidBase64Image);
             }
             //设置是否是第三方配送单
-            if (ordersBean.getDeliverStatus() != null) {
+            if (ordersBean.getAddInfo() !=null && StringUtils.isNotEmpty(ordersBean.getAddInfo().getDeliveryId())&& "0".equals(ordersBean.getAddInfo().getDeliveryId())) {
                 responseVo.setHasThirdDelivery(true);
+                responseVo.setDeliveryId(ordersBean.getAddInfo().getDeliveryId());
             }
             responseVo.setDeliveryStatus(ordersBean.getDeliverStatus());
             responseVo.setQueueIndex(ordersBean.getQueueIndex());

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

@@ -314,7 +314,10 @@ public class QueryOrderResponseVo {
      * 配送状态
      */
     private Integer deliveryStatus;
-
+    /**
+     * 运单号
+     */
+    private String deliveryId;
     /**
      * 骑手名称 商家自配送名称
      */