add deliver

yami-shop-bean/src/main/java/com/yami/shop/bean/dto/OrderRefundDto.java

@@ -92,6 +92,8 @@ public class OrderRefundDto extends OrderRefund implements Serializable {
      */
     private Integer orderType;
 
+    private Integer dvyType;
+
     /**
      * true:可以取消退款  false：不可以取消退款（待发货状态->非整单退款->所有商品已经申请退款->不可取消退款）
      */

yami-shop-service/src/main/resources/mapper/OrderRefundMapper.xml

@@ -136,6 +136,7 @@
         <result column="s_order_pay_no" property="orderPayNo"/>
         <result column="s_settlement_id" property="settlementId"/>
         <result column="o_pay_time" property="orderPayTime"/>
+        <result column="o_dvy_type" property="dvyType"/>
 
         <result column="freight_amount" property="freightAmount"/>
         <result column="offset_points" property="offsetPoints"/>
@@ -168,6 +169,7 @@
 
     <sql id="selectJoinAll">
         SELECT r.*,
+               o.dvy_type      as o_dvy_type,
                o.pay_time      as o_pay_time,
                o.order_number  AS o_order_number,
                o.actual_total  AS o_actual_total,