From 4020d0a807a82e36d0fe195109856045c4016531 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Tue, 12 Aug 2025 16:32:23 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat:=E4=BD=99=E9=A2=9D=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/WalletManageMapper.xml   | 125 ++++++++++++------
 1 file changed, 84 insertions(+), 41 deletions(-)

diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/WalletManageMapper.xml b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/WalletManageMapper.xml
index 998eacc44..920b3dabd 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/WalletManageMapper.xml
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/WalletManageMapper.xml
@@ -194,49 +194,18 @@
     </select>
 
     <select id="selectTotalBalance" resultType="java.lang.Long">
-        SELECT
-        SUM(a.balance)
+        SELECT SUM(latest_balance.balance)
+        FROM (
+        SELECT DISTINCT a.user_id,
+        m.wallet_type_id,
+        FIRST_VALUE(a.balance) OVER (
+        PARTITION BY a.user_id, m.wallet_type_id
+        ORDER BY a.create_time DESC
+        ) as balance
         FROM wallet_transaction a
-        LEFT JOIN wallet_manage m on a.wallet_id = m.id
+        INNER JOIN wallet_manage m
+        ON a.wallet_id = m.id
         <where>
-            a.del_flag = 0
-            <if test="dto.walletRecordMonth != null">
-                AND a.create_time = (
-                SELECT MAX(sub.create_time)
-                FROM wallet_transaction sub
-                LEFT JOIN wallet_manage wallet on wallet.id = sub.wallet_id
-                WHERE sub.user_id = a.user_id
-                AND DATE_FORMAT(sub.create_time, '%Y-%m') &lt;= #{dto.walletRecordMonth}
-                <if test="dto.userId != null">
-                    AND sub.user_id = #{dto.userId}
-                </if>
-                <if test="dto.userIds != null and dto.userIds.size() != 0">
-                    and sub.user_id in
-                    <foreach collection="dto.userIds" item="v" open="(" close=")" separator=",">
-                        #{v}
-                    </foreach>
-                </if>
-                <if test="dto.deptIds != null and dto.deptIds.size() != 0">
-                    <choose>
-                        <when test="dto.isInclude != null and dto.isInclude == true">
-                            and wallet.dept_id IN
-                        </when>
-                        <when test="dto.isInclude != null and dto.isInclude == false">
-                            and wallet.dept_id NOT IN
-                        </when>
-                        <otherwise>
-                            and wallet.dept_id IN
-                        </otherwise>
-                    </choose>
-                    <foreach collection="dto.deptIds" item="v" open="(" close=")" separator=",">
-                        #{v}
-                    </foreach>
-                </if>
-                <if test="dto.walletTypeId != null">
-                    AND wallet.wallet_type_id = #{dto.walletTypeId}
-                </if>
-                )
-            </if>
             <if test="dto.userId != null">
                 AND a.user_id = #{dto.userId}
             </if>
@@ -266,5 +235,79 @@
                 </foreach>
             </if>
         </where>
+        ) latest_balance
     </select>
+
+    <!--        SELECT-->
+    <!--        SUM(a.balance)-->
+    <!--        FROM wallet_transaction a-->
+    <!--        LEFT JOIN wallet_manage m on a.wallet_id = m.id-->
+    <!--        <where>-->
+    <!--            a.del_flag = 0-->
+    <!--            <if test="dto.walletRecordMonth != null">-->
+    <!--                AND a.create_time = (-->
+    <!--                SELECT MAX(sub.create_time)-->
+    <!--                FROM wallet_transaction sub-->
+    <!--                LEFT JOIN wallet_manage wallet on wallet.id = sub.wallet_id-->
+    <!--                WHERE sub.user_id = a.user_id-->
+    <!--                AND DATE_FORMAT(sub.create_time, '%Y-%m') &lt;= #{dto.walletRecordMonth}-->
+    <!--                <if test="dto.userId != null">-->
+    <!--                    AND sub.user_id = #{dto.userId}-->
+    <!--                </if>-->
+    <!--                <if test="dto.userIds != null and dto.userIds.size() != 0">-->
+    <!--                    and sub.user_id in-->
+    <!--                    <foreach collection="dto.userIds" item="v" open="(" close=")" separator=",">-->
+    <!--                        #{v}-->
+    <!--                    </foreach>-->
+    <!--                </if>-->
+    <!--                <if test="dto.deptIds != null and dto.deptIds.size() != 0">-->
+    <!--                    <choose>-->
+    <!--                        <when test="dto.isInclude != null and dto.isInclude == true">-->
+    <!--                            and wallet.dept_id IN-->
+    <!--                        </when>-->
+    <!--                        <when test="dto.isInclude != null and dto.isInclude == false">-->
+    <!--                            and wallet.dept_id NOT IN-->
+    <!--                        </when>-->
+    <!--                        <otherwise>-->
+    <!--                            and wallet.dept_id IN-->
+    <!--                        </otherwise>-->
+    <!--                    </choose>-->
+    <!--                    <foreach collection="dto.deptIds" item="v" open="(" close=")" separator=",">-->
+    <!--                        #{v}-->
+    <!--                    </foreach>-->
+    <!--                </if>-->
+    <!--                <if test="dto.walletTypeId != null">-->
+    <!--                    AND wallet.wallet_type_id = #{dto.walletTypeId}-->
+    <!--                </if>-->
+    <!--                )-->
+    <!--            </if>-->
+    <!--            <if test="dto.userId != null">-->
+    <!--                AND a.user_id = #{dto.userId}-->
+    <!--            </if>-->
+    <!--            <if test="dto.walletTypeId != null">-->
+    <!--                AND m.wallet_type_id = #{dto.walletTypeId}-->
+    <!--            </if>-->
+    <!--            <if test="dto.userIds != null and dto.userIds.size() != 0">-->
+    <!--                and a.user_id in-->
+    <!--                <foreach collection="dto.userIds" item="v" open="(" close=")" separator=",">-->
+    <!--                    #{v}-->
+    <!--                </foreach>-->
+    <!--            </if>-->
+    <!--            <if test="dto.deptIds != null and dto.deptIds.size() != 0">-->
+    <!--                <choose>-->
+    <!--                    <when test="dto.isInclude != null and dto.isInclude == true">-->
+    <!--                        and m.dept_id IN-->
+    <!--                    </when>-->
+    <!--                    <when test="dto.isInclude != null and dto.isInclude == false">-->
+    <!--                        and m.dept_id NOT IN-->
+    <!--                    </when>-->
+    <!--                    <otherwise>-->
+    <!--                        and m.dept_id IN-->
+    <!--                    </otherwise>-->
+    <!--                </choose>-->
+    <!--                <foreach collection="dto.deptIds" item="v" open="(" close=")" separator=",">-->
+    <!--                    #{v}-->
+    <!--                </foreach>-->
+    <!--            </if>-->
+    <!--        </where>-->
 </mapper>
\ No newline at end of file

From ea5849ab6a1be6aaa4bf6c1863e6de19e8c8007b Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Tue, 12 Aug 2025 16:54:31 +0800
Subject: [PATCH 2/3] 11

---
 .../src/main/resources/mapper/WalletManageMapper.xml            | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/WalletManageMapper.xml b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/WalletManageMapper.xml
index 920b3dabd..5693321d6 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/WalletManageMapper.xml
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/WalletManageMapper.xml
@@ -206,6 +206,8 @@
         INNER JOIN wallet_manage m
         ON a.wallet_id = m.id
         <where>
+            a.del_flag = '0'
+            AND DATE_FORMAT(sub.create_time, '%Y-%m') &lt;= #{dto.walletRecordMonth}
             <if test="dto.userId != null">
                 AND a.user_id = #{dto.userId}
             </if>

From 7584926e62edba4e8b78e3c250f45f1de2b6a4b7 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Tue, 12 Aug 2025 16:55:51 +0800
Subject: [PATCH 3/3] 11

---
 .../src/main/resources/mapper/WalletManageMapper.xml            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/WalletManageMapper.xml b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/WalletManageMapper.xml
index 5693321d6..18530584e 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/WalletManageMapper.xml
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/WalletManageMapper.xml
@@ -207,7 +207,7 @@
         ON a.wallet_id = m.id
         <where>
             a.del_flag = '0'
-            AND DATE_FORMAT(sub.create_time, '%Y-%m') &lt;= #{dto.walletRecordMonth}
+            AND DATE_FORMAT(a.create_time, '%Y-%m') &lt;= #{dto.walletRecordMonth}
             <if test="dto.userId != null">
                 AND a.user_id = #{dto.userId}
             </if>