From bd6f95560cd10385b928dca0274eff21a0592a17 Mon Sep 17 00:00:00 2001
From: 0000 <a0000@0000deMacBook-Pro.local>
Date: Sun, 15 Jun 2025 21:06:46 +0800
Subject: [PATCH] =?UTF-8?q?feat:h5=E6=8E=A8=E5=B9=BF=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=20->=20=E4=B8=8B=E7=BA=A7=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E4=B8=80=E5=88=97=EF=BC=8C?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E7=94=A8=E6=88=B7=E4=BD=99=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/orders/OrdersDao.xml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/orders/OrdersDao.xml b/src/main/resources/mapper/orders/OrdersDao.xml
index c8a26e2..75a7787 100644
--- a/src/main/resources/mapper/orders/OrdersDao.xml
+++ b/src/main/resources/mapper/orders/OrdersDao.xml
@@ -661,13 +661,15 @@
         select u.user_id as userId,u.user_name as userName,u.avatar,u.create_time as createTime,
         <if test="type==1">
             (select ifnull(sum(o.zhi_rate),0.00) from orders o where
-            o.user_id = u.user_id and o.state=2 and zhi_user_id=#{userId} ) as money
+            o.user_id = u.user_id and o.state=2 and zhi_user_id=#{userId} ) as money,
         </if>
         <if test="type==2">
             (select ifnull(sum(o.fei_rate),0.00) from orders o where
-            o.user_id = u.user_id and o.state=2 and fei_user_id=#{userId} ) as money
+            o.user_id = u.user_id and o.state=2 and fei_user_id=#{userId} ) as money,
         </if>
+        ifnull(um.money, 0.00) as balance
         from tb_user u
+        left join user_money um on u.user_id = um.user_id
         where
         <if test="type==1">
             inviter_code=#{invitationCode}
@@ -685,7 +687,8 @@
                         u.user_name   AS userName,
                         u.avatar,
                         u.create_time AS createTime,
-                        o.money
+                        o.money,
+                        ifnull(um.money, 0.00) as balance
                  from (
                           SELECT ifnull(sum(fei_rate), 0.00) as money, user_id
                           FROM orders
@@ -693,6 +696,7 @@
                             and fei_user_id = #{userId}
                           GROUP BY user_id) o
                           left join tb_user u on u.user_id = o.user_id
+                          left join user_money um on u.user_id = um.user_id
              ) a
         order by money desc
     </select>