From fbe6ab3f9dee466b1b6557f27c862322ef45a89b Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Sun, 02 Mar 2025 14:15:18 +0800
Subject: [PATCH] refactor(mallMember): 注释掉会员列表页面的三个按钮- 注释掉了"碳币拨付"、"碳积分拨付"和"修改会员等级"三个按钮 - 保留了"添加会员"、"登录密码重置"和"资金密码重置"按钮
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 57 insertions(+), 2 deletions(-)
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 d66f230..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;
}
@@ -127,6 +181,7 @@
if (type == 1) {
mallMember.setDirector(value);
+ mallMember.setDirectorTime(DateUtil.date());
} else if (type == 2){
mallMember.setStoreMaster(value);
} else {
--
Gitblit v1.9.1