From fae7d9ed5d3102dc398e1aebc108665dc78496df Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Tue, 28 Oct 2025 18:13:50 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=9D=E5=A4=96=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/czg/market/vo/InviteUserVO.java  |  5 ++++
 .../main/resources/mapper/ShopUserMapper.xml  | 24 ++++++++++++-------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/vo/InviteUserVO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/vo/InviteUserVO.java
index ef32844b8..2353275f3 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/market/vo/InviteUserVO.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/market/vo/InviteUserVO.java
@@ -34,6 +34,11 @@ public class InviteUserVO implements Serializable {
      * 一级收益
      */
     private BigDecimal oneIncome;
+    private BigDecimal totalIncome;
+    private BigDecimal pendingIncome;
+    private BigDecimal receivedIncome;
+    private BigDecimal withdrawnIncome;
+    private Integer status;
     /**
      * 邀请时间
      */
diff --git a/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml b/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml
index 62b5c0cf9..717c7e7c6 100644
--- a/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml
+++ b/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml
@@ -263,16 +263,22 @@
         order by u.create_time desc
     </select>
     <select id="getInviteUser" resultType="com.czg.market.vo.InviteUserVO">
-        SELECT user.head_img                                   AS headImg,
-               user.nick_name                                  AS shopUserName,
-               user.phone                                      AS shopUserPhone,
-               user.one_income                                 AS oneIncome,
-               user.invite_time                                AS inviteTime,
-               dist.distribution_level_id                      AS levelId,
-               dist.distribution_level_name                    AS levelName,
-               CASE WHEN dist.id IS NOT NULL THEN 1 ELSE 0 END AS isDistribution
+        SELECT
+        user.head_img AS headImg,
+        user.nick_name AS shopUserName,
+        user.phone AS shopUserPhone,
+        user.one_income AS oneIncome,
+        user.invite_time AS inviteTime,
+        dist.total_income AS totalIncome,
+        dist.pending_income AS pendingIncome,
+        dist.received_income AS receivedIncome,
+        dist.withdrawn_income AS withdrawnIncome,
+        dist.status AS status,
+        dist.distribution_level_id AS levelId,
+        dist.distribution_level_name AS levelName,
+        CASE WHEN dist.id IS NOT NULL THEN 1 ELSE 0 END AS isDistribution
         FROM `tb_shop_user` user
-                 left join mk_distribution_user dist on user.id = dist.id
+        left join mk_distribution_user dist on user.id = dist.id
         WHERE user.`distribution_user_id` = #{distributionUserId}
         <if test="shopUserId != null">and user.id = #{shopUserId}</if>
         ORDER BY user.`create_time` DESC