From 2044bdc87a0b72aacb969484e3fdb2d73dc6730a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Sat, 28 Feb 2026 20:17:01 +0800 Subject: [PATCH] =?UTF-8?q?feat(order):=20=E6=B7=BB=E5=8A=A0=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5=E5=B9=B6=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E5=85=B3=E8=81=94=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 ShopDealerOrder 实体中新增 orderStatus 字段用于显示订单状态 - 更新 ShopDealerOrderMapper.xml 中的关联查询，加入订单状态字段映射 - 修改 application.yml 配置文件，将默认激活环境从 dev 改为 glt2 - 通过 LEFT JOIN 关联 shop_order 表获取订单状态数据 --- src/main/java/com/gxwebsoft/shop/entity/ShopDealerOrder.java | 4 ++++ .../com/gxwebsoft/shop/mapper/xml/ShopDealerOrderMapper.xml | 3 ++- src/main/resources/application.yml | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopDealerOrder.java b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerOrder.java index e3c0c74..43bbff8 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopDealerOrder.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerOrder.java @@ -39,6 +39,10 @@ public class ShopDealerOrder implements Serializable { @Excel(name = "订单编号") private String orderNo; + @Excel(name = "订单状态") + @TableField(exist = false) + private Integer orderStatus; + @Schema(description = "买家用户昵称") @TableField(exist = false) private String nickname; diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerOrderMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerOrderMapper.xml index 7b4a182..b49c42d 100644 --- a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerOrderMapper.xml +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerOrderMapper.xml @@ -4,7 +4,7 @@ - SELECT a.*, b.nickname, c.nickname AS firstNickname, d.nickname AS secondNickname, e.nickname AS thirdNickname, f.rate, f.price, g.nickname AS firstDividendUserName, h.nickname AS secondDividendUserName + SELECT a.*, b.nickname, c.nickname AS firstNickname, d.nickname AS secondNickname, e.nickname AS thirdNickname, f.rate, f.price, g.nickname AS firstDividendUserName, h.nickname AS secondDividendUserName, o.order_status AS orderStatus FROM shop_dealer_order a LEFT JOIN gxwebsoft_core.sys_user b ON a.user_id = b.user_id LEFT JOIN gxwebsoft_core.sys_user c ON a.first_user_id = c.user_id @@ -12,6 +12,7 @@ LEFT JOIN gxwebsoft_core.sys_user e ON a.third_user_id = e.user_id LEFT JOIN gxwebsoft_core.sys_user g ON a.first_dividend_user = g.user_id LEFT JOIN gxwebsoft_core.sys_user h ON a.second_dividend_user = h.user_id + LEFT JOIN shop_order o ON a.order_no = o.order_no LEFT JOIN shop_dealer_user f ON a.user_id = f.user_id diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index ada4ffe..5be3164 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -4,7 +4,7 @@ server: # 多环境配置 spring: profiles: - active: dev + active: glt2 application: name: server