Merge branch 'main' of http://47.98.207.247:3000/lsq/ship-ota-server into main

ship-module-trade/ship-module-trade-biz/src/main/resources/mapper/order/TradeOrderMapper.xml

@@ -2584,7 +2584,7 @@
                                                 LEFT JOIN product_voyage pv ON td.voyage_id = pv.id
                                                 LEFT JOIN resource_route rr ON pv.route_id = rr.id
         where DATE_FORMAT(td.travel_date, '%Y-%m-%d') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL (-#{day}) DAY), '%Y-%m-%d')
-          and td.deleted='0' and td.link_mobile is not null and td.order_status >0 and rr.direction = #{direction};
+          and td.deleted='0' and td.link_mobile is not null and td.order_status in (0,1,2,3,6,7,8,9,12,13,14,15) and rr.direction = #{direction};
     </select>
 
     <select id="queryOrderJzPhone" resultType="java.util.Map">
@@ -2594,7 +2594,7 @@
                                            LEFT JOIN product_voyage pv ON td.voyage_id = pv.id
                                            LEFT JOIN resource_route rr ON pv.route_id = rr.id
         where DATE_FORMAT(td.travel_date, '%Y-%m-%d') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL (-#{day}) DAY), '%Y-%m-%d')
-          and td.deleted='0' and tzd.phone is not null and td.order_status >0 and rr.direction = #{direction};
+          and td.deleted='0' and tzd.phone is not null and td.order_status in (0,1,2,3,6,7,8,9,12,13,14,15) and rr.direction = #{direction};
     </select>
 </mapper>
 

ship-module-trade/ship-module-trade-biz/src/main/resources/mapper/orderjzdetail/OrderJzDetailMapper.xml

@@ -45,7 +45,7 @@
         <if test="vo.signStatus != null and vo.signStatus == 0">
             and d.sign_time is null
         </if>
-        order by d.address asc, d.arrive_time asc, d.batch_no asc
+        order by d.address asc, d.arrive_time asc
     </select>
 
     <!-- selectVisitorExportList: 导出游客接站明细，条件与selectPage2一致，不分页 -->
@@ -84,7 +84,7 @@
         <if test="vo.signStatus != null and vo.signStatus == 0">
             and d.sign_time is null
         </if>
-        order by d.address asc, d.arrive_time asc, d.batch_no asc
+        order by d.address asc, d.arrive_time asc
     </select>
 
     <select id="selectPage3" resultType="map">
@@ -152,7 +152,7 @@
         <if test="vo.otaId != null and vo.otaId != ''">
             and o.source_id = #{vo.otaId}
         </if>
-        order by d.address asc, d.arrive_time asc, d.batch_no asc
+        order by d.address asc, d.arrive_time asc
     </select>
 
     <!-- 赠送行程导出查询：条件与selectGiftPage一致，不分页 -->
@@ -197,7 +197,7 @@
         <if test="vo.otaId != null and vo.otaId != ''">
             and o.source_id = #{vo.otaId}
         </if>
-        order by d.address asc, d.arrive_time asc, d.batch_no asc
+        order by d.address asc, d.arrive_time asc
     </select>
 
     <!-- 赠送行程补登订单查询：根据订单号/证件号后4位搜索，关联trade_detail过滤product_id -->