From ce7f72ff0a44cb6e980b05a538a0339439248b99 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 17 十二月 2024 16:03:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/BalanceChangeRecordServiceImpl.java | 39 +++++++++++++++++++++++++++++++++++++++
1 files changed, 39 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 8291e71..828b2a5 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
@@ -1,17 +1,32 @@
package com.ruoyi.account.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.account.api.model.AppUser;
import com.ruoyi.account.api.model.BalanceChangeRecord;
import com.ruoyi.account.api.model.UserClickLog;
+import com.ruoyi.account.api.model.WithdrawalRequests;
import com.ruoyi.account.dto.BalanceQuery;
import com.ruoyi.account.mapper.BalanceChangeRecordMapper;
+import com.ruoyi.account.service.AppUserService;
import com.ruoyi.account.service.BalanceChangeRecordService;
+import com.ruoyi.account.vo.CommissionStatistics;
+import com.ruoyi.common.core.utils.StringUtils;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.stream.Collectors;
@Service
public class BalanceChangeRecordServiceImpl extends ServiceImpl<BalanceChangeRecordMapper, BalanceChangeRecord> implements BalanceChangeRecordService {
+ @Resource
+ private AppUserService appUserService;
+
@Override
public IPage<BalanceChangeRecord> pageList(BalanceQuery agentQuery) {
Page<BalanceChangeRecord> page = new Page<>();
@@ -20,4 +35,28 @@
IPage<BalanceChangeRecord> shopIPage = this.baseMapper.pageList(page, agentQuery);
return shopIPage;
}
+
+ @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);
+ }
}
--
Gitblit v1.7.1