修改bug

无关风月

2025-01-16 ec7528bb6cc65d3bce1c33d59e48ea5bc81c7782

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/BalanceChangeRecordServiceImpl.java

@@ -53,6 +53,19 @@
        IPage<BalanceChangeRecord> balanceChangeRecordIPage = this.baseMapper.queryCommissionStatistics(page, balanceChangeRecord);
        // 过滤商城购物
        List<BalanceChangeRecord> collect = balanceChangeRecordIPage.getRecords().stream().filter(e -> e.getChangeType() != 5).collect(Collectors.toList());
        for (BalanceChangeRecord changeRecord : collect) {
            if (changeRecord.getBeforeAmount()!=null && changeRecord.getAfterAmount()!=null){
                BigDecimal subtract = changeRecord.getBeforeAmount().subtract(changeRecord.getAfterAmount());
                if (subtract.compareTo(BigDecimal.ZERO)>0){
                    // 减少
                    changeRecord.setChangeAmountString("-￥"+changeRecord.getChangeAmount());
                }else if (subtract.compareTo(BigDecimal.ZERO)<0){
                    changeRecord.setChangeAmountString("+￥"+changeRecord.getChangeAmount());
                }else{
                    changeRecord.setChangeAmountString("￥"+changeRecord.getChangeAmount());
                }
            }
        }
        balanceChangeRecordIPage.setRecords(collect);
        return new CommissionStatistics(totalCommission, balanceChangeRecordIPage);
    }
@@ -82,9 +95,14 @@
        int fromIndex = (int) ((current - 1) * size);
        int toIndex = (int) Math.min(fromIndex + size, walletStatisticsDetailList.size());


        Page<WalletStatisticsDetail> walletStatisticsDetailPage = new Page<>();
        WalletStatistics walletStatistics = new WalletStatistics();
        if (fromIndex >= walletStatisticsDetailList.size()) {
            throw new ServiceException("页面参数无效");
            walletStatistics.setPage(walletStatisticsDetailPage);
            return walletStatistics;
        }



        Map<Integer, BigDecimal> shopCommissionMap = walletStatisticsDetailList.stream()
@@ -102,9 +120,12 @@
        BigDecimal totalShopWithdraw = shopCommissionMap.get(7);

        List<WalletStatisticsDetail> walletStatisticsDetailList2 = walletStatisticsDetailList.subList(fromIndex, toIndex);

        WalletStatistics walletStatistics = new WalletStatistics();
        Page<WalletStatisticsDetail> walletStatisticsDetailPage = new Page<>();
        for (WalletStatisticsDetail changeRecord : walletStatisticsDetailList2) {
            if (changeRecord.getChangeType().equals(1)||changeRecord.getChangeType().equals(3)||changeRecord.getChangeType().equals(4)||changeRecord.getChangeType().equals(6)){
                changeRecord.setChangeAmountString("+￥"+changeRecord.getChangeAmount());
            } else{
            changeRecord.setChangeAmountString("-￥"+changeRecord.getChangeAmount());
        }
        walletStatisticsDetailPage.setCurrent(current);
        walletStatisticsDetailPage.setSize(size);
        walletStatisticsDetailPage.setTotal(walletStatisticsDetailList.size());