From ce65eefb41076efb4f15e1543e272c0b40da531b 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 21:39:47 +0800
Subject: [PATCH] =?UTF-8?q?feat(shop):=20=E6=B7=BB=E5=8A=A0=E5=88=86?=
 =?UTF-8?q?=E9=94=80=E5=95=86=E5=92=8C=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=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

- 在 ShopUserReferee 实体类中添加分销商和用户的相关字段- 更新 ShopUserRefereeMapper.xml，实现分销商和用户的关联查询
- 新增字段包括昵称、头像和手机号等信息
---
 .../shop/entity/ShopUserReferee.java          | 25 +++++++++++++++++++
 .../shop/mapper/xml/ShopUserRefereeMapper.xml |  4 ++-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopUserReferee.java b/src/main/java/com/gxwebsoft/shop/entity/ShopUserReferee.java
index afac0b2..231d023 100644
--- a/src/main/java/com/gxwebsoft/shop/entity/ShopUserReferee.java
+++ b/src/main/java/com/gxwebsoft/shop/entity/ShopUserReferee.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;
@@ -29,9 +30,33 @@ public class ShopUserReferee 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/ShopUserRefereeMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopUserRefereeMapper.xml
index 2406f51..08cdac8 100644
--- a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopUserRefereeMapper.xml
+++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopUserRefereeMapper.xml
@@ -4,8 +4,10 @@
 
     <!-- 关联查询sql -->
     <sql id="selectSql">
-        SELECT a.*
+        SELECT a.*, d.nickname AS dealerNickname, u.nickname, d.avatar AS dealerAvatar, u.avatar, d.phone AS dealerPhone, 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
         <where>
             <if test="param.id != null">
                 AND a.id = #{param.id}