快递

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/refund/refund.html

@@ -298,6 +298,10 @@
                     field: 'statusName',
                     title: '退款状态'
                 },
+                {
+                    field: 'mailno',
+                    title: '运单号'
+                },
                 {
                     field: 'refundError',
                     title: '退款结果备注',

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/OrderRefundDao.java

@@ -76,6 +76,8 @@ public class OrderRefundDao implements Serializable {
 
     private String performanceTitle;
 
+    private String mailno;
+
     public void setStatusName(Integer status){
         this.status=status;
         switch (status){

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderRefundsMapper.xml

@@ -34,11 +34,13 @@
         <result column="created_at" property="createdAt"/>
     </resultMap>
     <select id="misRefundList" resultType="com.liquidnet.service.kylin.dao.OrderRefundDao" resultMap="misRefundListResult">
-        SELECT a.*, b.order_code, b.performance_title
+        SELECT a.*, b.order_code, b.performance_title, d.mailno
         FROM kylin_order_refunds AS a
         JOIN kylin_order_tickets AS b ON a.order_tickets_id = b.order_tickets_id
         JOIN kylin_order_ticket_relations AS c ON a.order_tickets_id = c.order_id
+        LEFT JOIN kylin_order_express AS d ON d.order_tickets_id = a.order_tickets_id
         <where>
+                d.send_type = 2
             <if test="orderTicketsId!=''">
                 AND a.order_tickets_id = #{orderTicketsId}
             </if>

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderTicketsMapper.xml

@@ -313,7 +313,7 @@
         INNER JOIN kylin_order_ticket_status kots ON kot.order_tickets_id = kots.order_id
         INNER JOIN kylin_order_ticket_relations kotr ON kot.order_tickets_id = kotr.order_id
 
-        LEFT JOIN (SELECT * FROM kylin_order_express WHERE express_status NOT IN (1, 3)) AS oe ON oe.order_tickets_id =
+        LEFT JOIN (SELECT * FROM kylin_order_express WHERE express_status NOT IN (1, 3) AND send_type = 1) AS oe ON oe.order_tickets_id =
         kot.order_tickets_id
         -- LEFT JOIN (SELECT * FROM kylin_order_express_route ORDER BY mid DESC LIMIT 1) AS oer ON oe.order_express_id =
         -- oer.order_express_id