From d6e819838bba8477029f53c68570402bf449ab8f Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期三, 18 十二月 2024 14:01:45 +0800
Subject: [PATCH] 1
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/BalanceChangeRecordServiceImpl.java | 23 +++--------------------
1 files changed, 3 insertions(+), 20 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 828b2a5..0cffbae 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
@@ -38,25 +38,8 @@
@Override
public CommissionStatistics commissionStatistics(Page<BalanceChangeRecord> page, BalanceChangeRecord balanceChangeRecord) {
-
- List<AppUser> appUserList = appUserService.list(new LambdaQueryWrapper<AppUser>()
- .like(StringUtils.isNotEmpty(balanceChangeRecord.getUserName()), AppUser::getName, balanceChangeRecord.getUserName())
- .like(StringUtils.isNotEmpty(balanceChangeRecord.getUserPhone()), AppUser::getPhone, balanceChangeRecord.getUserPhone()));
- if (CollectionUtils.isEmpty(appUserList)){
- return new CommissionStatistics();
- }
-
- List<Long> appUserIds = appUserList.stream().map(AppUser::getId).collect(Collectors.toList());
-
- BigDecimal totalCommission = appUserList.stream()
- .map(AppUser::getTotalDistributionAmount)
- .reduce(BigDecimal.ZERO, BigDecimal::add);
-
-
- Page<BalanceChangeRecord> changeRecordPage = page(page, new LambdaQueryWrapper<BalanceChangeRecord>()
- .in(BalanceChangeRecord::getAppUserId, appUserIds)
- .between(balanceChangeRecord.getStartTime() != null && balanceChangeRecord.getEndTime() != null,
- BalanceChangeRecord::getCreateTime, balanceChangeRecord.getStartTime(), balanceChangeRecord.getEndTime()));
- return new CommissionStatistics(totalCommission, changeRecordPage);
+ IPage<BalanceChangeRecord> balanceChangeRecordIPage = this.baseMapper.queryCommissionStatistics(page, balanceChangeRecord);
+// return new CommissionStatistics(totalCommission, changeRecordPage);
+ return null;
}
}
--
Gitblit v1.7.1