快递展示

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

@@ -107,19 +107,6 @@
                         return $.table.selectDictLabel(orderStatusDic, value);
                     }
                 },
-                {
-                    field: '',
-                    title: '快递',
-                    formatter: function (value, row, index) {
-                        var expressType = '';
-                        if (row.expressType == 1) {
-                            expressType = "寄付";
-                        } else {
-                            expressType = "到付";
-                        }
-                        return '快递方式：'+expressType+'<br>'+'快递费：'+row.priceExpress;
-                    }
-                },
                 {
                     field: '',
                     title: '购买用户',
@@ -140,6 +127,54 @@
                         return '姓名：'+expressContacts+'<br>'+'地址：'+expressAddress+'<br>'+'手机号：'+expressPhone;
                     }
                 },
+                {
+                    field: '',
+                    title: '快递费',
+                    formatter: function (value, row, index) {
+                        var expressType = '';
+                        if (row.expressType == 1) {
+                            expressType = "寄付";
+                        } else {
+                            expressType = "到付";
+                        }
+                        return '快递方式：'+expressType+'<br>'+'快递费：'+row.priceExpress;
+                    }
+                },
+                {
+                    field: '',
+                    title: '快递信息',
+                    formatter: function(value, row, index) {
+                        var mailno = row.mailno;
+                        var expressStatus = row.expressStatus;
+                        var expressStatusName = '';
+                        if (null == mailno) {
+                            mailno = '';
+                        }
+                        if (null != expressStatus) {
+                            switch (expressStatus) {
+                                case 1:
+                                    expressStatusName = '下单失败';
+                                    break;
+                                case 2:
+                                    expressStatusName = '下单成功';
+                                    break;
+                                case 3:
+                                    expressStatusName = '下单取消';
+                                    break;
+                                case 50:
+                                    expressStatusName = '已揽收';
+                                    break;
+                                case 80:
+                                    expressStatusName = '已签收';
+                                    break;
+                                default:
+                                    expressStatusName = '运输中';
+                                    break;
+                            }
+                        }
+                        return '快递单号：'+mailno+'<br>'+'快递状态：'+expressStatusName;
+                    }
+                },
                 {
                     title: '操作',
                     align: 'center',

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

@@ -19,8 +19,10 @@ public class PerformanceExpressPerformanceOrderListAdminDao {
     String expressContacts;
     String expressAddress;
     String expressPhone;
-    String expressStatus;
 
     Integer expressType;
 
+    String mailno;
+    Integer expressStatus;
+
 }

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

@@ -221,11 +221,16 @@
         kot.express_phone,
 
         kots.status,
-        kots.express_type
+        kots.express_type,
 
+        oe.mailno,
+        oe.express_status
         FROM kylin_order_tickets kot
-        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
+        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 = 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
         <where>
             kotr.performance_id = #{performancesId}
             AND kot.get_ticket_type = 'express'