From bd4d6ee6e9e303e6fdbf05fede63dc3cd50263c3 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 30 Dec 2024 17:33:30 +0800
Subject: [PATCH] feat(mall): 添加节点业绩累计功能
---
src/main/java/cc/mrbird/febs/mall/vo/MyTeamVo.java | 17 ++++++++
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 64 ++++++++++++++++++++++++++++++++
2 files changed, 81 insertions(+), 0 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
index 9b9e219..bf84667 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -80,6 +80,7 @@
private final MallGoodsCouponMapper mallGoodsCouponMapper;
private final MallMemberCouponMapper mallMemberCouponMapper;
private final MallGoodsMapper mallGoodsMapper;
+ private final MallChargeMapper mallChargeMapper;
private final MallVipConfigMapper mallVipConfigMapper;
private final RunVipMapper runVipMapper;
@@ -290,10 +291,62 @@
mallMemberVo.setWithdrawState(runVip.getWithdrawState());
mallMemberVo.setInsideState(runVip.getInsideState());
+
MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(mallMemberVo.getId());
mallMemberVo.setBalance(wallet.getBalance());
mallMemberVo.setScore(wallet.getScore());
return new FebsResponse().success().data(mallMemberVo);
+ }
+
+ private BigDecimal getDirectAchieve(String inviteId,Date startTime,Date endTime) {
+
+ try {
+ // 获取直推成员和团队成员的ID集合
+ Set<Long> memberIds = getTeamMemberIds(inviteId);
+
+ if (CollUtil.isEmpty(memberIds)) {
+ return BigDecimal.ZERO;
+ }
+
+ // 获取团队业绩(不包含本人业绩)
+ List<MallCharge> mallCharges = mallChargeMapper.selectList(
+ new LambdaQueryWrapper<MallCharge>()
+ .in(MallCharge::getMemberId, memberIds)
+ .eq(MallCharge::getState, YesOrNoEnum.YES.getValue())
+ .ge(MallCharge::getCreatedTime, startTime)
+ .lt(MallCharge::getCreatedTime, endTime)
+ );
+
+ if (CollUtil.isEmpty(mallCharges)) {
+ return BigDecimal.ZERO;
+ }
+
+ return mallCharges.stream()
+ .map(MallCharge::getAmount)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+ } catch (Exception e) {
+ // 异常处理
+ log.error("Error occurred while calculating direct achieve for member: {}", inviteId, e);
+ return BigDecimal.ZERO;
+ }
+ }
+ private Set<Long> getTeamMemberIds(String inviteId) {
+ Set<Long> memberIds = new HashSet<>();
+ // 获取直推成员
+ List<MallMember> directMembers = this.baseMapper.selectList(
+ new LambdaQueryWrapper<MallMember>()
+ .eq(MallMember::getReferrerId, inviteId)
+ );
+ memberIds.addAll(directMembers.stream().map(MallMember::getId).collect(Collectors.toSet()));
+
+ // 获取团队成员
+ List<MallMember> teamMembers = this.baseMapper.selectList(
+ new LambdaQueryWrapper<MallMember>()
+ .in(MallMember::getReferrerId, directMembers.stream().map(MallMember::getInviteId).collect(Collectors.toSet()))
+ );
+ memberIds.addAll(teamMembers.stream().map(MallMember::getId).collect(Collectors.toSet()));
+
+ return memberIds;
}
@Override
@@ -362,6 +415,17 @@
* 直属三级
*/
MyTeamVo myTeamVo = new MyTeamVo();
+ //节点和团队业绩
+ myTeamVo.setDirector(mallMember.getDirector());
+ if(mallMember.getDirector() == YesOrNoEnum.YES.getValue() && mallMember.getDirectorTime() != null){
+ myTeamVo.setDirectorTime(mallMember.getDirectorTime());
+ BigDecimal directAchieve = getDirectAchieve(mallMember.getInviteId(), mallMember.getDirectorTime(), DateUtil.date());
+ myTeamVo.setDirectorAchieve(directAchieve);
+ }else{
+ myTeamVo.setDirectorTime(mallMember.getCreatedTime());
+ BigDecimal directAchieve = getDirectAchieve(mallMember.getInviteId(), mallMember.getCreatedTime(), DateUtil.date());
+ myTeamVo.setDirectorAchieve(directAchieve);
+ }
//获取个人的碳币
MallMemberWallet mallMemberWallet = mallMemberWalletMapper.selectWalletByMemberId(memberId);
myTeamVo.setMyBalance(mallMemberWallet.getBalance());
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/MyTeamVo.java b/src/main/java/cc/mrbird/febs/mall/vo/MyTeamVo.java
index 0f50b86..b343329 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/MyTeamVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/MyTeamVo.java
@@ -1,10 +1,13 @@
package cc.mrbird.febs.mall.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
+import java.util.Date;
import java.util.List;
@Data
@@ -20,6 +23,20 @@
@ApiModelProperty(value = "团队碳币")
private BigDecimal myTeamBalance = BigDecimal.ZERO;
+ /**
+ * 是否是节点 1是 0否
+ */
+ @ApiModelProperty(value = "是否是节点 1是 0否")
+ private Integer director;
+ //升级为节点的时间
+ @ApiModelProperty(value = "业绩累计开始时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date directorTime;
+
+ @ApiModelProperty(value = "业绩累计")
+ private BigDecimal directorAchieve;
+
@ApiModelProperty(value = "团队列表")
private List<TeamListVo> team;
}
--
Gitblit v1.9.1