运单信息

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

@@ -363,7 +363,31 @@
                 },
                 {
                     field: 'mailno',
-                    title: '运单号'
+                    title: '运单信息',
+                    formatter: function (value, row) {
+                        let sendExpressTypeName = "";
+                        if (row.sendExpressType == 1) {
+                            sendExpressTypeName = "上门取件";
+                        } else if(row.sendExpressType == 2) {
+                            sendExpressTypeName = "自主发货";
+                        } else {
+                            sendExpressTypeName = "未知";
+                        }
+
+                        let expressStatusName = "";
+                        if (row.expressStatus == 1) {
+                            expressStatusName = "下单失败";
+                        } else if(row.expressStatus == 2) {
+                            if (row.sendExpressType == 1) {
+                                expressStatusName = "已下单";
+                            } else if(row.sendExpressType == 2) {
+                                expressStatusName = "运输中";
+                            }
+                        } else {
+                            expressStatusName = "运输中";
+                        }
+                        return value + '<br>' + sendExpressTypeName + '<br>' + expressStatusName + '<br>' + row.remark
+                    }
                 },
                 {
                     field: 'refundError',

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

@@ -79,6 +79,10 @@ public class OrderRefundDao implements Serializable {
     private String getTicketType;
 
     private String mailno;
+    private Integer sendExpressType;
+    private Integer expressStatus;
+    private String remark;
+
 
     public void setStatusName(Integer status){
         this.status=status;

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

@@ -81,7 +81,7 @@
 
     <select id="misRefundList" resultType="com.liquidnet.service.kylin.dao.OrderRefundDao" resultMap="misRefundListResult">
         select t.*, b.order_code, b.performance_title, b.get_ticket_type from
-            (select a.*, d.mailno
+            (select a.*, d.mailno, d.send_express_type,d.remark,d.express_status
             from kylin_order_refunds a
             LEFT JOIN kylin_order_express AS d ON d.order_refunds_id = a.order_refunds_id
             <where>