From 7ac9274fe534f9cd05ccd3d873a6544542666979 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Fri, 5 Sep 2025 23:05:23 +0800
Subject: [PATCH] =?UTF-8?q?refactor(shop):=20=E4=BF=AE=E6=94=B9=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=AD=97=E6=AE=B5=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将 dealerNickname 更改为 dealerName，以更好地反映字段的实际含义
- 此修改仅影响 XML 配置文件，不涉及代码逻辑变更
---
 .../shop/entity/ShopDealerReferee.java        | 25 +++++++++++++++++++
 .../mapper/xml/ShopDealerRefereeMapper.xml    | 10 +++++++-
 .../shop/mapper/xml/ShopUserRefereeMapper.xml |  8 +++++-
 src/main/resources/application-dev.yml        |  2 ++
 4 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopDealerReferee.java b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerReferee.java
index 81d2fde..4771fdf 100644
--- a/src/main/java/com/gxwebsoft/shop/entity/ShopDealerReferee.java
+++ b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerReferee.java
@@ -1,6 +1,7 @@
 package com.gxwebsoft.shop.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -28,9 +29,33 @@ public class ShopDealerReferee implements Serializable {
     @Schema(description = "分销商用户ID")
     private Integer dealerId;
 
+    @Schema(description = "分销商名称")
+    @TableField(exist = false)
+    private String dealerName;
+
+    @Schema(description = "分销商头像")
+    @TableField(exist = false)
+    private String dealerAvatar;
+
+    @Schema(description = "分销商手机号")
+    @TableField(exist = false)
+    private String dealerPhone;
+
     @Schema(description = "用户id(被推荐人)")
     private Integer userId;
 
+    @Schema(description = "昵称")
+    @TableField(exist = false)
+    private String nickname;
+
+    @Schema(description = "头像")
+    @TableField(exist = false)
+    private String avatar;
+
+    @Schema(description = "手机号")
+    @TableField(exist = false)
+    private String phone;
+
     @Schema(description = "推荐关系层级(1,2,3)")
     private Integer level;
 
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerRefereeMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerRefereeMapper.xml
index 52ea387..79b6bf7 100644
--- a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerRefereeMapper.xml
+++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerRefereeMapper.xml
@@ -4,8 +4,16 @@
 
     <!-- 关联查询sql -->
     <sql id="selectSql">
-        SELECT a.*
+        SELECT a.*,
+               d.nickname AS dealerName,
+               d.avatar AS dealerAvatar,
+               d.phone AS dealerPhone,
+               u.nickname,
+               u.avatar,
+               u.phone
         FROM shop_dealer_referee a
+        LEFT JOIN gxwebsoft_core.sys_user d ON a.dealer_id = d.user_id
+        LEFT JOIN gxwebsoft_core.sys_user u ON a.user_id = u.user_id
         <where>
             <if test="param.id != null">
                 AND a.id = #{param.id}
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopUserRefereeMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopUserRefereeMapper.xml
index d9c4320..3a1d993 100644
--- a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopUserRefereeMapper.xml
+++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopUserRefereeMapper.xml
@@ -4,7 +4,13 @@
 
     <!-- 关联查询sql -->
     <sql id="selectSql">
-        SELECT a.*, d.nickname AS dealerName, u.nickname, d.avatar AS dealerAvatar, u.avatar, d.phone AS dealerPhone, u.phone
+        SELECT a.*,
+               d.nickname AS dealerName,
+               d.avatar AS dealerAvatar,
+               d.phone AS dealerPhone,
+               u.nickname,
+               u.avatar,
+               u.phone
         FROM shop_user_referee a
         LEFT JOIN gxwebsoft_core.sys_user d ON a.dealer_id = d.user_id
         LEFT JOIN gxwebsoft_core.sys_user u ON a.user_id = u.user_id
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 63de5e2..c28b126 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -25,6 +25,8 @@ logging:
   level:
     com.gxwebsoft: DEBUG
     com.baomidou.mybatisplus: DEBUG
+    com.gxwebsoft.shop.mapper: DEBUG
+    org.apache.ibatis: DEBUG
 
 socketio:
   host: localhost #IP地址