修改订单配送类型

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

@@ -1340,7 +1340,9 @@ 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());
+        responseVo.setDeliveryType(orderBean.getAddInfo() == null ? "" : orderBean.getAddInfo().getDeliveryType());
+
         if (deliveryBaseResponse.getData().getCurrentPoint() != null) {
             String[] currentPoint = deliveryBaseResponse.getData().getCurrentPoint().split(",");
             responseVo.setRiderLongitude(currentPoint[0]);