修改bug

Pu Zhibing

2025-01-16 a23f0ba99b7e3c1ad270dd5a263a6b48b4b8fb6f

 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);
    }
@@ -62,14 +75,36 @@
        ShopBalanceStatement shopBalanceStatement = new ShopBalanceStatement();
        shopBalanceStatement.setType(1);

        IPage<BalanceChangeRecord> balanceChangeRecordIPage = this.baseMapper.queryCommissionStatistics(page, balanceChangeRecord);
        IPage<WalletStatisticsDetail> walletStatisticsDetailIPage = balanceChangeRecordIPage.convert(changeRecord -> {
        List<BalanceChangeRecord> balanceChangeRecordList = this.baseMapper.selectBalanceChangeRecordList(balanceChangeRecord);
        List<WalletStatisticsDetail> walletStatisticsDetailList = new ArrayList<>();
        for (BalanceChangeRecord changeRecord : balanceChangeRecordList) {
            WalletStatisticsDetail walletStatisticsDetail = new WalletStatisticsDetail();
            BeanUtils.copyBeanProp(walletStatisticsDetail, changeRecord);
            return walletStatisticsDetail;
        });
            walletStatisticsDetailList.add(walletStatisticsDetail);
        }

        Map<Integer, BigDecimal> shopCommissionMap = walletStatisticsDetailIPage.getRecords().stream()

        // 按时间排序（倒序）
        walletStatisticsDetailList.sort(Comparator.comparing(WalletStatisticsDetail::getCreateTime).reversed());

        long current = page.getCurrent();
        long size = page.getSize();
        if (current < 1) {
            current = 1;
        }
        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()) {
            walletStatistics.setPage(walletStatisticsDetailPage);
            return walletStatistics;
        }


        Map<Integer, BigDecimal> shopCommissionMap = walletStatisticsDetailList.stream()
                .collect(Collectors.groupingBy(
                        WalletStatisticsDetail::getChangeType,
                        Collectors.reducing(
@@ -83,13 +118,22 @@
        BigDecimal totalWithdraw = shopCommissionMap.get(2);
        BigDecimal totalShopWithdraw = shopCommissionMap.get(7);


        WalletStatistics walletStatistics = new WalletStatistics();
        walletStatistics.setPage(walletStatisticsDetailIPage);
        walletStatistics.setTotalRecharge(totalRecharge);
        walletStatistics.setTotalWithdraw(totalWithdraw);
        walletStatistics.setTotalShopWithdraw(totalShopWithdraw);
        List<WalletStatisticsDetail> walletStatisticsDetailList2 = walletStatisticsDetailList.subList(fromIndex, toIndex);
        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());
            walletStatisticsDetailPage.setRecords(walletStatisticsDetailList2);
            walletStatistics.setPage(walletStatisticsDetailPage);
            walletStatistics.setTotalRecharge(totalRecharge);
            walletStatistics.setTotalWithdraw(totalWithdraw);
            walletStatistics.setTotalShopWithdraw(totalShopWithdraw);
        }
        return walletStatistics;
    }

}