Pu Zhibing
2025-04-22 fd7b8fb7c89832c28a838b0449bbb8a392433ee2
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/BalanceChangeRecordServiceImpl.java
@@ -55,7 +55,7 @@
    public CommissionStatistics commissionStatistics(Page<BalanceChangeRecord> page, BalanceChangeRecord balanceChangeRecord) {
        balanceChangeRecord.setChangeType(4);
        List<BalanceChangeRecord> balanceChangeRecordList = this.baseMapper.selectBalanceChangeRecordList(balanceChangeRecord);
        balanceChangeRecordList.forEach(s->s.setChangeAmount(s.getChangeAmount().multiply(new BigDecimal(s.getChangeDirection()))));
        BigDecimal totalCommission = balanceChangeRecordList.stream()
                .filter(item -> !(item.getChangeType().equals(2) && item.getChangeType().equals(5)))
                .map(BalanceChangeRecord::getChangeAmount)
@@ -66,16 +66,11 @@
        // 过滤商城购物
        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());
                }
            if (changeRecord.getChangeDirection() == -1){
                // 减少
                changeRecord.setChangeAmountString("-¥"+changeRecord.getChangeAmount());
            }else {
                changeRecord.setChangeAmountString("+¥"+changeRecord.getChangeAmount());
            }
        }
        balanceChangeRecordIPage.setRecords(collect);
@@ -95,12 +90,12 @@
            WalletStatisticsDetail walletStatisticsDetail = new WalletStatisticsDetail();
            BeanUtils.copyBeanProp(walletStatisticsDetail, changeRecord);
            BigDecimal beforeAmount = changeRecord.getBeforeAmount();
            BigDecimal afterAmount = changeRecord.getAfterAmount();
            if (beforeAmount.compareTo(afterAmount) < 0 && changeRecord.getChangeType().equals(2)){
            if(changeRecord.getChangeType() == 2){
                BigDecimal changeAmount = changeRecord.getChangeAmount();
                totalWithdraw = totalWithdraw.add(changeAmount);
            }
            if (changeRecord.getChangeDirection() == -1){
                walletStatisticsDetail.setFlag(2);
            }else {
                walletStatisticsDetail.setFlag(1);
@@ -142,7 +137,7 @@
        List<WalletStatisticsDetail> walletStatisticsDetailList2 = walletStatisticsDetailList.subList(fromIndex, toIndex);
        for (WalletStatisticsDetail changeRecord : walletStatisticsDetailList2) {
            Integer flag = changeRecord.getFlag();
            if (flag.equals(1)){
            if (flag == 1){
                changeRecord.setChangeAmountString("+¥"+changeRecord.getChangeAmount());
            }else {
                changeRecord.setChangeAmountString("-¥"+changeRecord.getChangeAmount());
@@ -179,9 +174,7 @@
                    }
                });
            
                BigDecimal beforeAmount = bc.getBeforeAmount();
                BigDecimal afterAmount = bc.getAfterAmount();
                if (beforeAmount.compareTo(afterAmount) > 0){
                if (bc.getChangeDirection() == -1){
                    bc.setFlag(2);
                }else {
                    bc.setFlag(1);