fix:充值钱包统计优化

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());

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;

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;
+
 }

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;
     }