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 @@ AND a.create_time <= #{param.createTimeEnd} + + AND (a.id = #{param.orderNo} OR COALESCE(o.order_no, f.order_no) = #{param.orderNo}) + + + AND u.phone = #{param.phone} + 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;