From 1205db4e3dc20905a7e52aa05c2670f98cb51a38 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期二, 14 一月 2025 15:19:38 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng --- ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/BalanceChangeRecordServiceImpl.java | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/BalanceChangeRecordServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/BalanceChangeRecordServiceImpl.java index 1d369a8..0198cd8 100644 --- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/BalanceChangeRecordServiceImpl.java +++ b/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); } -- Gitblit v1.7.1