From 4549fdf59ed9a6825e3e4ccbb29c77785f4db15e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Mon, 30 Mar 2026 18:05:07 +0800
Subject: [PATCH] =?UTF-8?q?feat(order):=20=E6=B7=BB=E5=8A=A0=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=9F=A5=E8=AF=A2=E4=B8=AD=E7=9A=84=E6=89=8B=E6=9C=BA?=
 =?UTF-8?q?=E5=8F=B7=E5=92=8C=E8=AE=A2=E5=8D=95=E5=8F=B7=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 GltTicketOrderMapper.xml 中新增订单号查询条件，支持按 ID 或订单号搜索
- 在 GltTicketOrderMapper.xml 中新增用户手机号查询条件
- 在 GltTicketOrderParam.java 中添加 phone 字段用于接收手机号参数
- 保持原有的关键词和其他查询条件不变
- 扩展了订单检索的灵活性和精确度
---
 .../com/gxwebsoft/glt/mapper/xml/GltTicketOrderMapper.xml   | 6 ++++++
 .../java/com/gxwebsoft/glt/param/GltTicketOrderParam.java   | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/src/main/java/com/gxwebsoft/glt/mapper/xml/GltTicketOrderMapper.xml b/src/main/java/com/gxwebsoft/glt/mapper/xml/GltTicketOrderMapper.xml
index f7efe52..8fa4c3c 100644
--- a/src/main/java/com/gxwebsoft/glt/mapper/xml/GltTicketOrderMapper.xml
+++ b/src/main/java/com/gxwebsoft/glt/mapper/xml/GltTicketOrderMapper.xml
@@ -87,6 +87,12 @@
             <if test="param.createTimeEnd != null">
                 AND a.create_time &lt;= #{param.createTimeEnd}
             </if>
+            <if test="param.orderNo != null">
+                AND (a.id = #{param.orderNo} OR COALESCE(o.order_no, f.order_no) = #{param.orderNo})
+            </if>
+            <if test="param.phone != null">
+                AND u.phone = #{param.phone}
+            </if>
             <if test="param.keywords != null">
                 AND (
                     a.address LIKE CONCAT('%', #{param.keywords}, '%')
diff --git a/src/main/java/com/gxwebsoft/glt/param/GltTicketOrderParam.java b/src/main/java/com/gxwebsoft/glt/param/GltTicketOrderParam.java
index 963d775..d05e078 100644
--- a/src/main/java/com/gxwebsoft/glt/param/GltTicketOrderParam.java
+++ b/src/main/java/com/gxwebsoft/glt/param/GltTicketOrderParam.java
@@ -42,6 +42,9 @@ public class GltTicketOrderParam extends BaseParam {
     @Schema(description = "订单编号")
     private String orderNo;
 
+    @Schema(description = "用户手机号")
+    private String phone;
+
     @Schema(description = "配送状态：10待配送、20配送中、30待客户确认、40已完成")
     @QueryField(type = QueryType.EQ)
     private Integer deliveryStatus;