From 9160668c11401736e8ae4fd7f0a840e89c18cb7a Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Fri, 25 Apr 2025 14:32:23 +0800
Subject: [PATCH] fix:bug

---
 .../service/impl/WalletManageServiceImpl.java |  4 ++--
 .../resources/mapper/WalletManageMapper.xml   | 22 ++++++++++++++-----
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletManageServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletManageServiceImpl.java
index 4c7c26962..0785c8c36 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletManageServiceImpl.java
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletManageServiceImpl.java
@@ -289,7 +289,7 @@ public class WalletManageServiceImpl extends ServiceImpl<WalletManageMapper, Wal
      */
     @Override
     public Page<WalletManageVo> pageJoinActive(Page page, WalletTopupActionDto dto, DataScope dataScope) {
-        if (ObjectUtil.isNotEmpty(dto.getUnactiveMonthsNumber())) {
+        if (ObjectUtil.isEmpty(dto.getUnactiveMonthsNumber())) {
             dto.setUnactiveMonthsNumber(3L);
         }
         String unactiveDayNumberStr = LocalDateTimeUtil.format(LocalDateTimeUtil.now().minusMonths(dto.getUnactiveMonthsNumber()), DatePattern.NORM_DATE_PATTERN);
@@ -303,7 +303,7 @@ public class WalletManageServiceImpl extends ServiceImpl<WalletManageMapper, Wal
      */
     @Override
     public List<WalletManageVo> pageListActive(WalletTopupActionDto dto, DataScope dataScope) {
-        if (ObjectUtil.isNotEmpty(dto.getUnactiveMonthsNumber())) {
+        if (ObjectUtil.isEmpty(dto.getUnactiveMonthsNumber())) {
             dto.setUnactiveMonthsNumber(3L);
         }
         String unactiveDayNumberStr = LocalDateTimeUtil.format(LocalDateTimeUtil.now().minusMonths(dto.getUnactiveMonthsNumber()), DatePattern.NORM_DATE_PATTERN);
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 bc74a132c..ec06c85d2 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
@@ -125,7 +125,7 @@
         <include refid="scopeUser"/>
     </delete>
 
-    <sql id="activeBalance">
+    <select id="activeBalancePage" resultType="com.bsd.pjcloud.wallet.api.vo.WalletManageVo">
         <include refid="selectA"/>
         1
         from wallet_manage a
@@ -173,13 +173,23 @@
                 #{v}
             </foreach>
         </if>
-    </sql>
-
-    <select id="activeBalancePage" resultType="com.bsd.pjcloud.wallet.api.vo.WalletManageVo">
-        <include refid="activeBalance"/>
+        group by a.user_id
     </select>
 
     <select id="activeBalanceList" resultType="com.bsd.pjcloud.wallet.api.vo.WalletManageVo">
-        <include refid="activeBalance"/>
+        <include refid="selectA"/>
+        (select max(sub.create_time)
+        from wallet_transaction sub
+        left join wallet_manage wallet on wallet.id = sub.wallet_id and wallet.tenant_id = 1
+        where sub.user_id = a.user_id
+        and sub.wallet_id = a.id
+        ) as createTime
+        from wallet_manage a
+        <where>
+            a.del_flag = 0
+            <if test="dto.userId != null">
+                AND a.user_id = #{dto.userId}
+            </if>
+        </where>
     </select>
 </mapper>
\ No newline at end of file