Merge branch 'master' of http://git.lionquexpress.com/wuweihua/BMS

2026-09-22 10:40:09 +08:00
parent 1240ff28fc cf01ad0299
commit 465b3e6b6b
10 changed files with 317 additions and 1 deletions
@@ -104,6 +104,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        limit 1
    </select>

+    <!-- TMS 状态查询使用精确匹配，避免模糊查询把多个订单误判为同一条。 -->
+    <select id="selectPrcOrderBillByTmsIdentifier" resultMap="PrcOrderBillResult">
+        <include refid="selectPrcOrderBillVo"/>
+        where order_no = #{identifier}
+           or tracking_no = #{identifier}
+           or transfer_no = #{identifier}
+        order by
+            case
+                when order_no = #{identifier} then 1
+                when tracking_no = #{identifier} then 2
+                when transfer_no = #{identifier} then 3
+                else 4
+            end,
+            create_time desc,
+            bill_id desc
+        limit 2
+    </select>
+
    <select id="selectPrcOrderBillById" parameterType="String" resultMap="PrcOrderBillResult">
        <include refid="selectPrcOrderBillVo"/>
        where bill_id = #{billId}