From 3f546f7e702a26ff51c3f6eedcdfa4045550ff65 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, 16 Mar 2026 12:50:52 +0800 Subject: [PATCH] =?UTF-8?q?feat(shop):=20=E6=9B=B4=E6=96=B0=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E9=85=8D=E7=BD=AE=E5=B9=B6=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81=E5=85=B3=E8=81=94=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改 application-glt2.yml 中的数据源配置，将数据库从 modules 更改为 gltdb - 修改 application-glt3.yml 中的数据源配置，将数据库从 modules 更改为 gltdb - 在 ShopDealerCapital 实体类中添加 orderStatus 字段用于存储订单状态 - 更新 ShopDealerCapitalMapper.xml 查询语句，关联 shop_order 表获取订单状态 - 添加 LEFT JOIN 条件连接 shop_order 表以获取订单状态信息 --- .../java/com/gxwebsoft/shop/entity/ShopDealerCapital.java | 4 ++++ .../gxwebsoft/shop/mapper/xml/ShopDealerCapitalMapper.xml | 3 ++- src/main/resources/application-glt2.yml | 6 +++--- src/main/resources/application-glt3.yml | 6 +++--- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopDealerCapital.java b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerCapital.java index 183dd57..0dadc24 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopDealerCapital.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerCapital.java @@ -37,6 +37,10 @@ public class ShopDealerCapital implements Serializable { @Schema(description = "订单编号") private String orderNo; + @Schema(description = "订单状态") + @TableField(exist = false) + private Integer orderStatus; + @Schema(description = "资金流动类型 (10佣金收入 20提现支出 30转账支出 40转账收入 50佣金解冻 60配送奖励)") private Integer flowType; diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerCapitalMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerCapitalMapper.xml index 98e03f8..d1fa10e 100644 --- a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerCapitalMapper.xml +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerCapitalMapper.xml @@ -4,11 +4,12 @@ - SELECT a.*, b.order_no, b.month, c.nickname AS nickName, d.nickname AS toNickName + SELECT a.*, b.order_no, b.month, c.nickname AS nickName, d.nickname AS toNickName, e.order_status AS orderStatus FROM shop_dealer_capital a LEFT JOIN shop_dealer_order b ON a.order_no = b.order_no LEFT JOIN gxwebsoft_core.sys_user c ON a.user_id = c.user_id and c.deleted = 0 LEFT JOIN gxwebsoft_core.sys_user d ON a.to_user_id = d.user_id and d.deleted = 0 + LEFT JOIN shop_order e ON a.order_no = e.order_no AND a.id = #{param.id} diff --git a/src/main/resources/application-glt2.yml b/src/main/resources/application-glt2.yml index b78a63f..4c43c50 100644 --- a/src/main/resources/application-glt2.yml +++ b/src/main/resources/application-glt2.yml @@ -7,9 +7,9 @@ server: # 数据源配置 spring: datasource: - url: jdbc:mysql://8.134.55.105:13306/modules?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8 - username: modules - password: tYmmMGh5wpwXR3ae + url: jdbc:mysql://8.134.55.105:13306/gltdb?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8 + username: gltdb + password: EeD4FtzyA5ksj7Bk driver-class-name: com.mysql.cj.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource diff --git a/src/main/resources/application-glt3.yml b/src/main/resources/application-glt3.yml index 0e17f39..6bd8987 100644 --- a/src/main/resources/application-glt3.yml +++ b/src/main/resources/application-glt3.yml @@ -4,9 +4,9 @@ server: # 数据源配置 spring: datasource: - url: jdbc:mysql://1Panel-mysql-XsWW:3306/modules?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai - username: modules - password: tYmmMGh5wpwXR3ae + url: jdbc:mysql://1Panel-mysql-XsWW:3306/gltdb?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai + username: gltdb + password: EeD4FtzyA5ksj7Bk driver-class-name: com.mysql.cj.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource druid: