From cf8510c34e5b41a39065efba0140dc767eccf446 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Wed, 9 Apr 2025 09:28:58 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E9=92=B1=E5=8C=85=E4=BD=99=E9=A2=9D?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/manager/HardDoorManagerMapper.xml    | 8 ++++----
 .../wallet/service/impl/WalletManageServiceImpl.java      | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/manager/HardDoorManagerMapper.xml b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/manager/HardDoorManagerMapper.xml
index 9013c5b5d..ac0532487 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/manager/HardDoorManagerMapper.xml
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/manager/HardDoorManagerMapper.xml
@@ -50,19 +50,19 @@
 
     <sql id="whereA">
         a.del_flag = '0'
-        <if test="dto.hard_id != null">
+        <if test="dto.hardId != null">
             and a.hard_id = #{dto.hardId}
         </if>
         <if test="dto.imei != null and dto.imei != '' ">
             and a.imei like concat('%', #{dto.imei}, '%')
         </if>
-        <if test="dto.power_status != null">
+        <if test="dto.powerStatus != null">
             and a.power_status = #{dto.powerStatus}
         </if>
-        <if test="dto.net_status != null">
+        <if test="dto.netStatus != null">
             and a.net_status = #{dto.netStatus}
         </if>
-        <if test="dto.sale_status != null">
+        <if test="dto.saleStatus != null">
             and a.sale_status = #{dto.saleStatus}
         </if>
     </sql>
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 6b7586a53..570e5da2c 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
@@ -344,11 +344,11 @@ public class WalletManageServiceImpl extends ServiceImpl<WalletManageMapper, Wal
             List<WalletManageBalanceVo> itemList = baseMapper.selectBalance(dto);
             if (ObjectUtil.isEmpty(itemList)) continue;
             for (WalletManageBalanceVo j : itemList) {
-                j.setWalletTypeName(i.getName());
-                walletList.stream().filter(v -> ObjectUtil.equals(v.getUserId(), j.getUserId())).findFirst().ifPresent(v -> {
+                walletList.stream().filter(v -> ObjectUtil.equals(i.getId(), v.getWalletTypeId()) && ObjectUtil.equals(v.getUserId(), j.getUserId())).findFirst().ifPresent(v -> {
                     if (ObjectUtil.isNotEmpty(j.getBalance())) {
                         v.setBalance(j.getBalance());
                         v.setLastTopUpTime(j.getCreateTime());
+                        v.setWalletTypeName(i.getName());
                     }
                 });
             }