From 199861555473ab50f2fafa3d58e42e64e838c039 Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期一, 24 二月 2025 22:47:18 +0800
Subject: [PATCH] 修改物流信息导入模板
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/BalanceChangeRecordServiceImpl.java | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 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 0baa978..733c3ef 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
@@ -42,6 +42,7 @@
@Override
public CommissionStatistics commissionStatistics(Page<BalanceChangeRecord> page, BalanceChangeRecord balanceChangeRecord) {
+ balanceChangeRecord.setChangeType(4);
List<BalanceChangeRecord> balanceChangeRecordList = this.baseMapper.selectBalanceChangeRecordList(balanceChangeRecord);
BigDecimal totalCommission = balanceChangeRecordList.stream()
@@ -75,18 +76,28 @@
ShopBalanceStatement shopBalanceStatement = new ShopBalanceStatement();
shopBalanceStatement.setType(1);
- List<BalanceChangeRecord> balanceChangeRecordList = this.baseMapper.selectBalanceChangeRecordList(balanceChangeRecord);
+ List<BalanceChangeRecord> balanceChangeRecordList = this.baseMapper.selectBalanceChangeRecordList1(balanceChangeRecord);
List<WalletStatisticsDetail> walletStatisticsDetailList = new ArrayList<>();
+ BigDecimal totalWithdraw = BigDecimal.ZERO;
for (BalanceChangeRecord changeRecord : balanceChangeRecordList) {
+
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)){
+ BigDecimal changeAmount = changeRecord.getChangeAmount();
+ totalWithdraw = totalWithdraw.add(changeAmount);
+ walletStatisticsDetail.setFlag(2);
+ }else {
+ walletStatisticsDetail.setFlag(1);
+ }
walletStatisticsDetailList.add(walletStatisticsDetail);
}
-
-
// 按时间排序（倒序）
walletStatisticsDetailList.sort(Comparator.comparing(WalletStatisticsDetail::getCreateTime).reversed());
-
long current = page.getCurrent();
long size = page.getSize();
if (current < 1) {
@@ -115,15 +126,15 @@
));
BigDecimal totalRecharge = shopCommissionMap.get(1);
- BigDecimal totalWithdraw = shopCommissionMap.get(2);
BigDecimal totalShopWithdraw = shopCommissionMap.get(7);
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());
+ Integer flag = changeRecord.getFlag();
+ if (flag.equals(1)){
+ changeRecord.setChangeAmountString("+￥"+changeRecord.getChangeAmount());
+ }else {
+ changeRecord.setChangeAmountString("-￥"+changeRecord.getChangeAmount());
}
walletStatisticsDetailPage.setCurrent(current);
walletStatisticsDetailPage.setSize(size);
--
Gitblit v1.7.1