Merge branch 'feature/20210129_【订单服务】订单详情信息接口对接配送返回骑手信息_wanghanghang'

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java

@@ -490,9 +490,24 @@ public class QueryOrdersResponse {
                 private String shopLatitude;
 
                 /**
-                 * 距离
+                 * 骑手与收货人骑行距离
                  */
                 private Integer distance;
+
+                /**
+                 * 骑手与收货人之间骑手时间
+                 */
+                private Integer duration;
+
+                /**
+                 * 骑手与门店骑行距离
+                 */
+                private Long storeDistance;
+
+                /**
+                 * 骑手与门店之间骑手时间
+                 */
+                private Integer storeDuration;
             }
 
             @NoArgsConstructor

order-application-service/src/main/java/cn/freemud/entities/dto/delivery/DeliveryStatusAndRiderPositionDto.java

@@ -30,10 +30,27 @@ public class DeliveryStatusAndRiderPositionDto {
      * 配送状态
      */
     private Integer devlieryStatus;
+
     /**
      * 距离
      */
     private Integer distance;
+
+    /**
+     * 骑手与收货人之间骑手时间
+     */
+    private Integer duration;
+
+    /**
+     * 骑手与门店骑行距离
+     */
+    private Long storeDistance;
+
+    /**
+     * 骑手与门店之间骑手时间
+     */
+    private Integer storeDuration;
+
     /**
      * 门店联系电话
      */

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

@@ -12,6 +12,12 @@ public class OrderRiderResponseVo {
      * 订单号
      */
     private String orderId;
+
+    /**
+     * 订单状态
+     */
+    private Integer orderStatus;
+
     /**
      * 配送号
      */
@@ -52,6 +58,22 @@ public class OrderRiderResponseVo {
      * 距离
      */
     private Integer distance;
+
+    /**
+     * 骑手与收货人之间骑手时间
+     */
+    private Integer duration;
+
+    /**
+     * 骑手与门店骑行距离
+     */
+    private Long storeDistance;
+
+    /**
+     * 骑手与门店之间骑手时间
+     */
+    private Integer storeDuration;
+
     /**
      * 操作日志
      */

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

@@ -1340,6 +1340,7 @@ public class OrderServiceImpl implements Orderservice {
         });
         responseVo.setOperationList(operationList);
         responseVo.setOrderId(orderBean.getOid());
+        responseVo.setOrderStatus(orderBean.getStatus());
         responseVo.setStorePhone(deliveryBaseResponse.getData().getStorePhone());
         responseVo.setRiderName(deliveryBaseResponse.getData().getRiderName());
         responseVo.setRiderPhone(deliveryBaseResponse.getData().getRiderPhone());
@@ -1360,6 +1361,10 @@ public class OrderServiceImpl implements Orderservice {
             responseVo.setDestLatitude(destPoint[1]);
         }
         responseVo.setDistance(deliveryBaseResponse.getData().getDistance());
+        responseVo.setDuration(deliveryBaseResponse.getData().getDuration());
+        responseVo.setStoreDistance(deliveryBaseResponse.getData().getStoreDistance());
+        responseVo.setStoreDuration(deliveryBaseResponse.getData().getStoreDuration());
+
         responseVo.setDeliveryId(deliveryBaseResponse.getData().getDeliveryId());
         responseVo.setDevlieryStatus(deliveryBaseResponse.getData().getDevlieryStatus());
         return ResponseUtil.success(responseVo);
@@ -1831,8 +1836,11 @@ public class OrderServiceImpl implements Orderservice {
             result.getDevlieryStatus().equals(DeliveryStatus.RIDERGETMEAL.getCode())||
             result.getDevlieryStatus().equals(DeliveryStatus.RIDERSTARTDELIVERY.getCode())
         ){
-            orderBean.getAddInfo().setDistance(deliveryBaseResponse.getData().getDistance());
             orderBean.getAddInfo().setDeliverStatus(result.getDevlieryStatus());
+            orderBean.getAddInfo().setDistance(deliveryBaseResponse.getData().getDistance());
+            orderBean.getAddInfo().setDuration(deliveryBaseResponse.getData().getDuration());
+            orderBean.getAddInfo().setStoreDistance(deliveryBaseResponse.getData().getStoreDistance());
+            orderBean.getAddInfo().setStoreDuration(deliveryBaseResponse.getData().getStoreDuration());
             orderBean.getAddInfo().setRiderName(result.getRiderName());
             orderBean.getAddInfo().setRiderPhone(result.getRiderPhone());
             orderBean.getAddInfo().setOrderId(orderBean.getOid());