快递订单列表查询展示优化

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PerformanceExpressSearchAdminParam.java

@@ -28,6 +28,8 @@ public class PerformanceExpressSearchAdminParam {
     private String expressContacts;
     private String expressPhone;
 
+    private String mailno;
+
     private List<String> ids;
 
 }

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

@@ -35,6 +35,10 @@
                             <label>收货人姓名：</label>
                             <input type="text" name="expressContacts"/>
                         </li>
+                        <li>
+                            <label>运单号：</label>
+                            <input type="text" name="mailno"/>
+                        </li>
                         <!--<li>
                             <label>订单状态：</label>
                             <select name="orderStatus" th:with="type=${@dict.getType('zhengzai_order_status')}">
@@ -55,9 +59,11 @@
                             <label>快递状态：</label>
                             <select name="expressStatus">
                                 <option value="">所有</option>
+                                <!-- 包含取消的3 未下单null 下单失败1 -->
                                 <option value="1">未下单</option>
                                 <option value="2">已下单</option>
-                                <option value="50">已揽收</option>
+<!--                                <option value="50">已揽收</option>-->
+                                <option value="70">运输中</option>
                                 <option value="80">已签收</option>
                             </select>
                         </li>
@@ -447,9 +453,9 @@
                                 case 3:
                                     expressStatusName = '下单取消';
                                     break;
-                                case 50:
+                                /*case 50:
                                     expressStatusName = '已揽收';
-                                    break;
+                                    break;*/
                                 case 80:
                                     expressStatusName = '已签收';
                                     break;

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

@@ -308,8 +308,8 @@
 
         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
+--         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'
@@ -328,8 +328,10 @@
             <if test="expressContacts != null  and expressContacts != ''">AND kot.express_contacts LIKE concat('%',
                 #{expressContacts}, '%')
             </if>
-            <if test="expressStatus != '' and expressStatus != 1">AND oe.express_status = ${expressStatus}</if>
-            <if test="expressStatus == 1">AND oe.express_status IS NULL</if>
+            <if test="expressStatus != '' and expressStatus != 1 and expressStatus != 70">AND oe.express_status = ${expressStatus}</if>
+            <if test="expressStatus == 1">AND (oe.express_status IS NULL OR oe.express_status = ${expressStatus})</if>
+            <if test="expressStatus == 70">AND (oe.express_status > 3 AND oe.express_status != 80)</if>
+            <if test="mailno != ''">AND oe.mailno LIKE concat('%', #{mailno}, '%')</if>
 
         </where>
     </select>