From 67823d9644e5c5e5890822cebf1920e94c5e3f64 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Mon, 13 Jul 2026 12:36:54 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=85=85=E5=80=BC=E9=92=B1=E5=8C=85?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/order/HardOrderTotalServiceImpl.java     | 4 ++--
 .../admin/service/impl/SysUserTransactionServiceImpl.java | 2 +-
 .../com/bsd/pjcloud/wallet/api/vo/WalletQbTotalVo.java    | 5 +++++
 .../wallet/service/impl/WalletManageServiceImpl.java      | 8 +++++++-
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderTotalServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderTotalServiceImpl.java
index 4b5682d4b..e87f4655d 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderTotalServiceImpl.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderTotalServiceImpl.java
@@ -528,7 +528,7 @@ public class HardOrderTotalServiceImpl implements HardOrderTotalService {
             WalletTransactionSumAndCountDto walletDto = new WalletTransactionSumAndCountDto();
             walletDto.setDeptIds(dto.getDeptIds());
             walletDto.setIsInclude(dto.getIsInclude());
-            walletDto.setBizTypes(List.of(WalletBizEnum.UPDATE.getCode()));
+            walletDto.setBizTypes(List.of(WalletBizEnum.UPDATE.getCode(), WalletBizEnum.RECHARGE.getCode()));
             walletDto.setType(WalletTransactionSumAndCountDto.TYPE_INCOME);
             if (ObjectUtil.isNotEmpty(dto.getCreateTimeList())) {
                 walletDto.setCreateTimeList(dto.getCreateTimeList());
@@ -543,7 +543,7 @@ public class HardOrderTotalServiceImpl implements HardOrderTotalService {
             WalletTransactionSumAndCountDto walletDto = new WalletTransactionSumAndCountDto();
             walletDto.setDeptIds(dto.getDeptIds());
             walletDto.setIsInclude(dto.getIsInclude());
-            walletDto.setBizTypes(List.of(WalletBizEnum.UPDATE.getCode()));
+            walletDto.setBizTypes(List.of(WalletBizEnum.UPDATE.getCode(), WalletBizEnum.RECHARGE.getCode()));
             walletDto.setType(WalletTransactionSumAndCountDto.TYPE_EXPENSE);
             if (ObjectUtil.isNotEmpty(dto.getCreateTimeList())) {
                 walletDto.setCreateTimeList(dto.getCreateTimeList());
diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserTransactionServiceImpl.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserTransactionServiceImpl.java
index f65aea0d6..8002a5fac 100644
--- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserTransactionServiceImpl.java
+++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserTransactionServiceImpl.java
@@ -192,7 +192,7 @@ public class SysUserTransactionServiceImpl extends ServiceImpl<SysUserTransactio
      * 回调
      */
     @Override
-    @Transactional(rollbackFor = Exception.class)
+    // @Transactional(rollbackFor = Exception.class)
     public void applyCallback(ProcessNodeRecordAssignUserParamDto dto, Long tenantId) {
         if (!flowUtil.checkCallback(dto)) {
             return;
diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/WalletQbTotalVo.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/WalletQbTotalVo.java
index 5a633bb77..10e5b90c6 100644
--- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/WalletQbTotalVo.java
+++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/WalletQbTotalVo.java
@@ -20,4 +20,9 @@ public class WalletQbTotalVo {
      */
     private Long payTotal = 0L;
 
+    /**
+     * 充值钱包余额
+     */
+    private Long topupTotal = 0L;
+
 }
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 eba556fb1..2b6f82dde 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
@@ -309,6 +309,9 @@ public class WalletManageServiceImpl extends ServiceImpl<WalletManageMapper, Wal
         WalletQbTotalVo result = new WalletQbTotalVo();
         // 查询钱包类表
         List<WalletTypeEntity> walletTypeList = walletTypeService.list();
+        if (ObjectUtil.isNotEmpty(dto.getWalletTypeId())) {
+            walletTypeList = walletTypeList.stream().filter(item -> ObjectUtil.equals(item.getId(), dto.getWalletTypeId())).toList();
+        }
         // 查询所有钱包类型的流水记录
         for (WalletTypeEntity i : walletTypeList) {
             WalletManageBalanceDto walletBalanceDto = BeanUtils.toBean(dto, WalletManageBalanceDto.class);
@@ -323,8 +326,11 @@ public class WalletManageServiceImpl extends ServiceImpl<WalletManageMapper, Wal
             if (ObjectUtil.equals(i.getUniqueCode(), WalletTypeEnum.PAY.getCode())) {
                 result.setPayTotal(total);
             }
+            if (ObjectUtil.equals(i.getUniqueCode(), WalletTypeEnum.TOPUP.getCode())) {
+                result.setTopupTotal(total);
+            }
         }
-        result.setTotal(result.getEatTotal() + result.getPayTotal());
+        result.setTotal(result.getEatTotal() + result.getPayTotal() + result.getTopupTotal());
         return result;
     }