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

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

@@ -90,9 +90,11 @@ public class OrderRiderResponseVo {
     private String riderPhone;
 
     /**
-     * 配送类型 1自配送(三方渠道配送、商家店员配送) 2平台配送
+     * 配送类型     SELF("self", "自配送"),
+     *              THIRD("third", "第三方配送");
      */
-    private Integer expressType;
+    private String deliveryType;
+
 
     @Data
     public static class Operation{

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

@@ -133,6 +133,7 @@ import com.freemud.sdk.api.assortment.order.adapter.OrderSdkAdapter;
 import com.freemud.sdk.api.assortment.order.enums.AutoOrderConfigTime;
 import com.freemud.sdk.api.assortment.order.enums.NewOrderType;
 import com.freemud.sdk.api.assortment.order.enums.OldOrderStatus;
+import com.freemud.sdk.api.assortment.order.enums.QueryDeliveryType;
 import com.freemud.sdk.api.assortment.order.request.order.*;
 import com.freemud.sdk.api.assortment.order.request.payment.CombPayRequest;
 import com.freemud.sdk.api.assortment.order.response.order.*;
@@ -1349,7 +1350,17 @@ public class OrderServiceImpl implements Orderservice {
         responseVo.setStorePhone(deliveryBaseResponse.getData().getStorePhone());
         responseVo.setRiderName(deliveryBaseResponse.getData().getRiderName());
         responseVo.setRiderPhone(deliveryBaseResponse.getData().getRiderPhone());
-        responseVo.setExpressType(orderBean.getExpressType());
+//        responseVo.setExpressType(orderBean.getExpressType());
+
+        if(orderBean.getAddInfo() != null && orderBean.getAddInfo().getDeliveryType() !=null && QueryDeliveryType.THIRD.getCode().equals(orderBean.getAddInfo().getDeliveryType())
+        && (DeliveryStatus.DELIVERYERROR.getCode() == orderBean.getAddInfo().getDeliverStatus() || DeliveryStatus.DELIVERYCANCEL.getCode() == orderBean.getAddInfo().getDeliverStatus())
+        ){
+            responseVo.setDeliveryType(QueryDeliveryType.SELF.getCode());
+        }else{
+            responseVo.setDeliveryType(orderBean.getAddInfo() == null ? "" : orderBean.getAddInfo().getDeliveryType());
+        }
+
+
         if (deliveryBaseResponse.getData().getCurrentPoint() != null) {
             String[] currentPoint = deliveryBaseResponse.getData().getCurrentPoint().split(",");
             responseVo.setRiderLongitude(currentPoint[0]);