From c5947256b22f2283214258827f61af09966cf490 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Tue, 31 Dec 2024 17:25:37 +0800
Subject: [PATCH] feat(mall): 添加会员列表直推、团队、业绩统计功能 - 在 MallMember 实体中添加直推数、团队数、业绩金额等字段 - 修改 getMallMemberList 方法，异步计算每个会员的直推、团队和业绩数据 - 在前端列表中显示直推、团队、业绩等列 - 优化数据查询效率，使用 LambdaQueryWrapper 和 CompletableFuture
---
src/main/java/cc/mrbird/febs/mall/entity/MallMember.java | 7 +++
src/main/java/cc/mrbird/febs/rabbit/consumer/AgentConsumer.java | 2
src/test/java/cc/mrbird/febs/AgentTest.java | 9 ++--
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java | 58 ++++++++++++++++++++++++++++-
src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html | 3 +
5 files changed, 71 insertions(+), 8 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java b/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java
index f564d01..b00ba0c 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java
@@ -188,4 +188,11 @@
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date vipLevelTime;
+
+ @TableField(exist = false)
+ private int directCnt = 0;
+ @TableField(exist = false)
+ private int teamCnt = 0;
+ @TableField(exist = false)
+ private BigDecimal achieveCnt = BigDecimal.ZERO;
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java
index 3fd94d1..5a38e8e 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java
@@ -1,5 +1,6 @@
package cc.mrbird.febs.mall.service.impl;
+import cc.mrbird.febs.common.configure.FebsConfigure;
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.common.enumerates.*;
@@ -17,12 +18,14 @@
import cc.mrbird.febs.pay.model.MemberWithdrawalDto;
import cc.mrbird.febs.pay.service.IXcxPayService;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.SecureUtil;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -34,8 +37,9 @@
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.stream.Collectors;
/**
* @author wzy
@@ -75,11 +79,61 @@
private final SalemanCouponMapper salemanCouponMapper;
private final MallMemberCouponMapper mallMemberCouponMapper;
private final MallGoodsCouponMapper mallGoodsCouponMapper;
+ private final FebsConfigure febsConfigure;
+ private final MallChargeMapper mallChargeMapper;
@Override
public IPage<MallMember> getMallMemberList(MallMember mallMember, QueryRequest request) {
Page<MallMember> page = new Page<>(request.getPageNum(), request.getPageSize());
IPage<MallMember> mallMembers = this.baseMapper.selectMallMemberListInPage(page, mallMember);
+ List<MallMember> records = mallMembers.getRecords();
+ if(CollUtil.isNotEmpty(records)){
+ List<CompletableFuture<Void>> futures = new ArrayList<>();
+ DateTime endTime = DateUtil.date();
+ records.forEach(item -> {
+ CompletableFuture<Void> uCompletableFuture = CompletableFuture.runAsync(() -> {
+ //获取直推
+ Set<String> directInviteIds = mallMemberMapper.selectList(
+ new LambdaQueryWrapper<MallMember>()
+ .eq(MallMember::getReferrerId, item.getInviteId())
+ ).stream()
+ .map(MallMember::getInviteId)
+ .collect(Collectors.toSet());
+ if(CollUtil.isNotEmpty(directInviteIds)){
+ item.setDirectCnt(directInviteIds.size());
+ //获取团队
+ List<MallMember> allMembers = mallMemberMapper.selectList(
+ new LambdaQueryWrapper<MallMember>()
+ .eq(MallMember::getReferrerId, item.getInviteId())
+ .or()
+ .in(MallMember::getReferrerId, directInviteIds)
+ );
+
+
+ if(CollUtil.isNotEmpty(allMembers)){
+ item.setTeamCnt(allMembers.size());
+ // 获取团队业绩(不包含本人业绩)
+ List<MallCharge> mallCharges = mallChargeMapper.selectList(
+ new LambdaQueryWrapper<MallCharge>()
+ .in(MallCharge::getMemberId, allMembers.stream().map(MallMember::getId).collect(Collectors.toSet()))
+ .eq(MallCharge::getState, YesOrNoEnum.YES.getValue())
+ .ge(MallCharge::getCreatedTime, item.getDirectorTime())
+ .lt(MallCharge::getCreatedTime, endTime)
+ );
+ if (CollUtil.isNotEmpty(mallCharges)) {
+ item.setAchieveCnt(mallCharges.stream()
+ .map(MallCharge::getAmount)
+ .reduce(BigDecimal.ZERO, BigDecimal::add));
+ }
+ }
+ }
+ }, febsConfigure.asyncThreadPoolTaskExecutor());
+ futures.add(uCompletableFuture);
+ });
+ // 等待所有任务完成
+ CompletableFuture<Void> allOf = CompletableFuture.allOf(futures.toArray(new CompletableFuture[0]));
+ allOf.join(); // 阻塞直到所有任务完成
+ }
return mallMembers;
}
diff --git a/src/main/java/cc/mrbird/febs/rabbit/consumer/AgentConsumer.java b/src/main/java/cc/mrbird/febs/rabbit/consumer/AgentConsumer.java
index ea6d6f4..fc27f1c 100644
--- a/src/main/java/cc/mrbird/febs/rabbit/consumer/AgentConsumer.java
+++ b/src/main/java/cc/mrbird/febs/rabbit/consumer/AgentConsumer.java
@@ -48,7 +48,7 @@
/**
- * 购买成功
+ * 节点升级
*/
@RabbitListener(queues = QueueConstants.RUN_VIP_NODE_UP)
public void nodeUpMsg(Long memberId) {
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
index 925fdf1..e283efb 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
@@ -256,6 +256,9 @@
{field: 'inviteId', title: '邀请码', minWidth: 100,align:'left'},
{field: 'balance', title: '碳币', minWidth: 100,align:'left', totalRow:true},
{field: 'score', title: '碳积分', minWidth: 100,align:'left', totalRow:true},
+ {field: 'directCnt', title: '直推', minWidth: 100,align:'left', totalRow:true},
+ {field: 'teamCnt', title: '团队', minWidth: 100,align:'left', totalRow:true},
+ {field: 'achieveCnt', title: '业绩', minWidth: 100,align:'left', totalRow:true},
{field: 'referrerName', title: '推荐人', minWidth: 100,align:'left'},
{field: 'levelName', title: '会员等级', minWidth: 100,align:'left'},
{field: 'director', title: '节点', templet: '#switchDirector', minWidth: 100,align:'center'},
diff --git a/src/test/java/cc/mrbird/febs/AgentTest.java b/src/test/java/cc/mrbird/febs/AgentTest.java
index fd3ce90..bcd0b30 100644
--- a/src/test/java/cc/mrbird/febs/AgentTest.java
+++ b/src/test/java/cc/mrbird/febs/AgentTest.java
@@ -3,7 +3,6 @@
import cc.mrbird.febs.mall.service.IApiMallMemberService;
import cc.mrbird.febs.mall.service.IMemberProfitService;
import lombok.extern.slf4j.Slf4j;
-import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
@@ -27,8 +26,8 @@
// }
//
// }
- @Test
- public void getCouponAmountMapV2(){
- memberProfitService.updateMemberCoin();
- }
+// @Test
+// public void getCouponAmountMapV2(){
+// memberProfitService.updateMemberCoin();
+// }
}
--
Gitblit v1.9.1