From 1c1c341bb909e8cf5d2f164138c8610fea19935b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Sun, 1 Mar 2026 20:44:46 +0800 Subject: [PATCH] =?UTF-8?q?feat(ticket):=20=E6=B7=BB=E5=8A=A0=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除 GltTicketOrder 中 orderNo 字段的 @TableField(exist = false) 注解 - 在 GltTicketOrderParam 中添加 orderNo 字段并导入 TableField 注解 - 在 GltUserTicket 中添加 orderStatus 字段用于存储订单状态 - 更新 GltUserTicketMapper.xml 中的关联查询 SQL，添加订单状态字段映射 - 修改关联条件从 order_id 改为 order_no 进行关联查询 - 在查询条件中添加订单状态的筛选功能 - 在 GltUserTicketParam 中添加 orderStatus 查询参数 --- src/main/java/com/gxwebsoft/glt/entity/GltTicketOrder.java | 1 - src/main/java/com/gxwebsoft/glt/entity/GltUserTicket.java | 4 ++++ .../com/gxwebsoft/glt/mapper/xml/GltUserTicketMapper.xml | 7 +++++-- .../java/com/gxwebsoft/glt/param/GltTicketOrderParam.java | 4 ++++ .../java/com/gxwebsoft/glt/param/GltUserTicketParam.java | 4 ++++ 5 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/gxwebsoft/glt/entity/GltTicketOrder.java b/src/main/java/com/gxwebsoft/glt/entity/GltTicketOrder.java index 9038bb1..2e37503 100644 --- a/src/main/java/com/gxwebsoft/glt/entity/GltTicketOrder.java +++ b/src/main/java/com/gxwebsoft/glt/entity/GltTicketOrder.java @@ -32,7 +32,6 @@ public class GltTicketOrder implements Serializable { private Integer userTicketId; @Schema(description = "订单编号") - @TableField(exist = false) private String orderNo; @Schema(description = "门店ID") diff --git a/src/main/java/com/gxwebsoft/glt/entity/GltUserTicket.java b/src/main/java/com/gxwebsoft/glt/entity/GltUserTicket.java index 0448d2a..4a6e8a4 100644 --- a/src/main/java/com/gxwebsoft/glt/entity/GltUserTicket.java +++ b/src/main/java/com/gxwebsoft/glt/entity/GltUserTicket.java @@ -88,6 +88,10 @@ public class GltUserTicket implements Serializable { @TableField(exist = false) private String phone; + @Schema(description = "订单状态") + @TableField(exist = false) + private Integer orderStatus; + @Schema(description = "排序(数字越小越靠前)") private Integer sortNumber; diff --git a/src/main/java/com/gxwebsoft/glt/mapper/xml/GltUserTicketMapper.xml b/src/main/java/com/gxwebsoft/glt/mapper/xml/GltUserTicketMapper.xml index c0f6ef0..7ba5daf 100644 --- a/src/main/java/com/gxwebsoft/glt/mapper/xml/GltUserTicketMapper.xml +++ b/src/main/java/com/gxwebsoft/glt/mapper/xml/GltUserTicketMapper.xml @@ -4,12 +4,12 @@ - SELECT a.*, u.nickname, u.avatar, u.phone, m.name AS templateName, o.pay_price AS payPrice + SELECT a.*, u.nickname, u.avatar, u.phone, m.name AS templateName, o.pay_price AS payPrice, o.order_status as orderStatus FROM glt_user_ticket a LEFT JOIN gxwebsoft_core.sys_user u ON a.user_id = u.user_id LEFT JOIN glt_ticket_template m ON a.template_id = m.id - LEFT JOIN shop_order o ON a.order_id = o.order_id AND a.tenant_id = o.tenant_id AND o.deleted = 0 + LEFT JOIN shop_order o ON a.order_no = o.order_no AND a.tenant_id = o.tenant_id AND o.deleted = 0 AND a.id = #{param.id} @@ -26,6 +26,9 @@ AND a.order_no LIKE CONCAT('%', #{param.orderNo}, '%') + + AND o.order_status = #{param.orderStatus} + AND a.order_goods_id = #{param.orderGoodsId} diff --git a/src/main/java/com/gxwebsoft/glt/param/GltTicketOrderParam.java b/src/main/java/com/gxwebsoft/glt/param/GltTicketOrderParam.java index 976a20b..d612cb4 100644 --- a/src/main/java/com/gxwebsoft/glt/param/GltTicketOrderParam.java +++ b/src/main/java/com/gxwebsoft/glt/param/GltTicketOrderParam.java @@ -1,5 +1,6 @@ package com.gxwebsoft.glt.param; +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonInclude; import com.gxwebsoft.common.core.annotation.QueryField; import com.gxwebsoft.common.core.annotation.QueryType; @@ -38,6 +39,9 @@ public class GltTicketOrderParam extends BaseParam { @QueryField(type = QueryType.EQ) private Integer riderId; + @Schema(description = "订单编号") + private String orderNo; + @Schema(description = "配送状态：10待配送、20配送中、30待客户确认、40已完成") @QueryField(type = QueryType.EQ) private Integer deliveryStatus; diff --git a/src/main/java/com/gxwebsoft/glt/param/GltUserTicketParam.java b/src/main/java/com/gxwebsoft/glt/param/GltUserTicketParam.java index fa448a7..93873e7 100644 --- a/src/main/java/com/gxwebsoft/glt/param/GltUserTicketParam.java +++ b/src/main/java/com/gxwebsoft/glt/param/GltUserTicketParam.java @@ -40,6 +40,10 @@ public class GltUserTicketParam extends BaseParam { @Schema(description = "订单编号") private String orderNo; + @Schema(description = "订单状态") + @QueryField(type = QueryType.EQ) + private Integer orderStatus; + @Schema(description = "订单商品ID") @QueryField(type = QueryType.EQ) private Integer orderGoodsId;