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 | 123 ++++++++++++++++++++++++++++++++--------
1 files changed, 97 insertions(+), 26 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 49a765d..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,11 +1,12 @@
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.AgentLevelEnum;
-import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum;
+import cc.mrbird.febs.common.enumerates.*;
import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.common.utils.AppContants;
+import cc.mrbird.febs.common.utils.MallUtils;
import cc.mrbird.febs.common.utils.RedisUtils;
import cc.mrbird.febs.mall.dto.*;
import cc.mrbird.febs.mall.entity.*;
@@ -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,25 +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);
-// if(CollUtil.isNotEmpty(mallMembers.getRecords())){
-// for(MallMember mallMemberTeam : mallMembers.getRecords()){
-// Long salesmansId = mallMemberTeam.getSalesmansId();
-// MallSalesman mallSalesman = mallSalesmanMapper.selectById(salesmansId);
-// if(ObjectUtil.isNotEmpty(mallSalesman)){
-// StringBuffer salesmanName = new StringBuffer();
-// salesmanName.append(mallSalesman.getName());
-// if(2 == mallSalesman.getState()){
-// salesmanName.append("（禁用）");
-// }
-// mallMemberTeam.setSalesmansName(salesmanName.toString());
-// }
-// }
-// }
+ 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;
}
@@ -104,8 +144,19 @@
if(ObjectUtil.isEmpty(mallMember)) {
return new FebsResponse().fail().message("会员信息不存在");
}
- mallMember.setAccountStatus(MallMember.ACCOUNT_STATUS_DISABLED);
+ mallMember.setAccountStatus(YesOrNoEnum.NO.getValue());
mallMemberMapper.updateById(mallMember);
+
+ String redisKey = AppContants.APP_LOGIN_PREFIX + mallMember.getId();
+ String existToken = redisUtils.getString(redisKey);
+ if (StrUtil.isNotBlank(existToken)) {
+ Object o = redisUtils.get(existToken);
+ if (ObjectUtil.isNotEmpty(o)) {
+ redisUtils.del(existToken);
+ }
+ }
+ redisUtils.del(AppContants.APP_LOGIN_PREFIX + id);
+ redisUtils.del(AppContants.XCX_LOGIN_PHONE_PREFIX + id);
return new FebsResponse().success();
}
@@ -116,7 +167,7 @@
if(ObjectUtil.isEmpty(mallMember)) {
return new FebsResponse().fail().message("会员信息不存在");
}
- mallMember.setAccountStatus(MallMember.ACCOUNT_STATUS_ENABLE);
+ mallMember.setAccountStatus(YesOrNoEnum.YES.getValue());
mallMemberMapper.updateById(mallMember);
return new FebsResponse().success();
}
@@ -130,6 +181,7 @@
if (type == 1) {
mallMember.setDirector(value);
+ mallMember.setDirectorTime(DateUtil.date());
} else if (type == 2){
mallMember.setStoreMaster(value);
} else {
@@ -360,7 +412,7 @@
if(ObjectUtil.isEmpty(mallMember)){
throw new FebsException("请刷新页面");
}
- String redisKey = AppContants.XCX_LOGIN_PREFIX + mallMember.getId();
+ String redisKey = AppContants.APP_LOGIN_PREFIX + mallMember.getId();
String existToken = redisUtils.getString(redisKey);
if (StrUtil.isNotBlank(existToken)) {
Object o = redisUtils.get(existToken);
@@ -368,7 +420,7 @@
redisUtils.del(existToken);
}
}
- redisUtils.del(AppContants.XCX_LOGIN_PREFIX + id);
+ redisUtils.del(AppContants.APP_LOGIN_PREFIX + id);
redisUtils.del(AppContants.XCX_LOGIN_PHONE_PREFIX + id);
this.baseMapper.deleteById(mallMember);
return new FebsResponse().success().message("操作成功");
@@ -515,27 +567,46 @@
}
Integer type = mallSystemPayDto.getType();
+ Integer flowType = 0;
+ Integer moneyType = 0;
+ String moneyTypeDec = "";
String filedType = "";
if (type == 1) {
filedType = "balance";
+ flowType = FlowTypeEnum.BALANCE.getValue();
+ moneyType = RunVipMoneyFlowTypeEnum.SYS_BALANCE.getValue();
+ moneyTypeDec = RunVipMoneyFlowTypeEnum.SYS_BALANCE.getDescription();
} else if (type == 2) {
filedType = "score";
+ flowType = FlowTypeEnum.SCORE.getValue();
+ moneyType = RunVipMoneyFlowTypeEnum.SYS_SCORE.getValue();
+ moneyTypeDec = RunVipMoneyFlowTypeEnum.SYS_SCORE.getDescription();
} else if (type == 3) {
filedType = "prizeScore";
} else {
- throw new FebsException("参数错误");
+ throw new FebsException("操作失败");
}
if (isReduce) {
int i = iApiMallMemberWalletService.reduce(mallSystemPayDto.getAddBalance().negate(), mallSystemPayDto.getId(), filedType);
if (i == 2) {
- throw new FebsException("剩余数量不足");
+ throw new FebsException("操作失败");
}
} else {
iApiMallMemberWalletService.add(mallSystemPayDto.getAddBalance(), mallSystemPayDto.getId(), filedType);
}
- mallMoneyFlowService.addMoneyFlow(memberId, bigDecimal, MoneyFlowTypeEnum.SYSTEM.getValue(), null, type);
+ String orderNo = MallUtils.getOrderNum("SYS");
+ mallMoneyFlowService.runVipMoneyFlowAdd(
+ mallMember.getId(),
+ mallMember.getId(),
+ orderNo,
+ flowType,
+ moneyType,
+ bigDecimal,
+ StrUtil.format(moneyTypeDec,bigDecimal),
+ YesOrNoEnum.YES.getValue()
+ );
return new FebsResponse().success();
}
@@ -585,7 +656,7 @@
// 重置交易密码
if (type == 1) {
- String payPwd = SecureUtil.md5("654321");
+ String payPwd = SecureUtil.md5("123456");
member.setTradePassword(payPwd);
// 重置登录密码
} else {
--
Gitblit v1.9.1