From e1aedb313407c64318415f28aae85834103e0aa5 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 05 Aug 2024 18:31:31 +0800
Subject: [PATCH] 后台
---
src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java | 89 ++++++++++++++++++++++++++------------------
1 files changed, 53 insertions(+), 36 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
index 1b24461..7fb3294 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
@@ -1207,42 +1207,13 @@
MallMemberAmount mallMemberAmountMine = mallMemberAmountMapper.selectByMemberId(mallProductBuy.getMemberId());
mallMemberAmountMine.setTrendsNft(mallMemberAmountMine.getTrendsNft().add(profit));
mallMemberAmountMapper.updateTrendsNftById(mallMemberAmountMine);
- }
- BigDecimal remainderDirect = bigDecimal.divide(new BigDecimal(String.valueOf(cycle)),0,BigDecimal.ROUND_DOWN);//取余
- if(remainderDirect.compareTo(BigDecimal.ONE) == 0){
/**
- * 更新用户上级收益，冻结7天，7天时间到期自动释放到动态钱包
+ * 团队奖励
+ *
*/
- Long memberId = mallProductBuy.getMemberId();
- MallMember mallMember = memberMapper.selectById(memberId);
+ MallMember mallMember = memberMapper.selectById(mallProductBuy.getMemberId());
if(ObjectUtil.isNotEmpty(mallMember)){
- if(DateUtil.compare(payTime,DateUtil.parseDate("2024-3-26"))<= 0){
- //直推
- String referrerId = mallMember.getReferrerId();
- MallMember directMember = memberMapper.selectInfoByInviteId(referrerId);
- if(ObjectUtil.isNotEmpty(directMember)){
- BigDecimal basicPerkDirectPercent = new BigDecimal(dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
- DataDictionaryEnum.BASIC_PERK_DIRECT.getType(),
- DataDictionaryEnum.BASIC_PERK_DIRECT.getCode()
- ).getValue()).multiply(new BigDecimal("0.01"));
-
- BigDecimal basicPerkDirect = nftTotal.multiply(basicPerkDirectPercent).setScale(2, BigDecimal.ROUND_DOWN);
- /**
- * 如果用户是冻结，则直接销毁
- */
- createPerk(directMember,basicPerkDirect.multiply(new BigDecimal("0.5")));
- if(StrUtil.isNotEmpty(directMember.getReferrerId())){
- MallMember directMemberDirect = memberMapper.selectInfoByInviteId(directMember.getReferrerId());
- createPerk(directMemberDirect,basicPerkDirect.multiply(new BigDecimal("0.5")));
- }
- }
- }
-
- /**
- * 团队奖励
- *
- */
String level = MemberLevelNewEnum.ZERO_LEVEL.getType();
BigDecimal equalsPerkBasic = BigDecimal.ZERO;//平级收益，假设平级，则算平级收益的百分比收益
boolean flag = false;
@@ -1310,6 +1281,38 @@
parentId = mallMemberRef.getReferrerId();
if (StrUtil.isBlank(mallMemberRef.getReferrerId())) {
flag = true;
+ }
+ }
+ }
+ }
+
+ BigDecimal remainderDirect = bigDecimal.divide(new BigDecimal(String.valueOf(cycle)),0,BigDecimal.ROUND_DOWN);//取余
+ if(remainderDirect.compareTo(BigDecimal.ONE) == 0){
+ /**
+ * 更新用户上级收益，冻结7天，7天时间到期自动释放到动态钱包
+ */
+ Long memberId = mallProductBuy.getMemberId();
+ MallMember mallMember = memberMapper.selectById(memberId);
+ if(ObjectUtil.isNotEmpty(mallMember)){
+ if(DateUtil.compare(payTime,DateUtil.parseDate("2024-3-26"))<= 0){
+ //直推
+ String referrerId = mallMember.getReferrerId();
+ MallMember directMember = memberMapper.selectInfoByInviteId(referrerId);
+ if(ObjectUtil.isNotEmpty(directMember)){
+ BigDecimal basicPerkDirectPercent = new BigDecimal(dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.BASIC_PERK_DIRECT.getType(),
+ DataDictionaryEnum.BASIC_PERK_DIRECT.getCode()
+ ).getValue()).multiply(new BigDecimal("0.01"));
+
+ BigDecimal basicPerkDirect = nftTotal.multiply(basicPerkDirectPercent).setScale(2, BigDecimal.ROUND_DOWN);
+ /**
+ * 如果用户是冻结，则直接销毁
+ */
+ createPerk(directMember,basicPerkDirect.multiply(new BigDecimal("0.5")));
+ if(StrUtil.isNotEmpty(directMember.getReferrerId())){
+ MallMember directMemberDirect = memberMapper.selectInfoByInviteId(directMember.getReferrerId());
+ createPerk(directMemberDirect,basicPerkDirect.multiply(new BigDecimal("0.5")));
+ }
}
}
}
@@ -1980,6 +1983,9 @@
if(ObjectUtil.isEmpty(mallMemberRef)){
continue;
}
+// if(mallMemberRef.getId() != 2366L){
+// continue;
+// }
// List<MallMember> mallMembersAll = memberMapper.selectAllChildAgentListByInviteId(referrerId);
// if(ObjectUtil.isEmpty(mallMembersAll)){
// continue;
@@ -2012,13 +2018,24 @@
int levelCode = MemberLevelNewEnum.ZERO_LEVEL.getLevelCode(level);
List<MallMember> mallMembersAll = new ArrayList<>();
- if(levelCode > 0){
+ if(levelCode > 1){
String levelType = MemberLevelNewEnum.ZERO_LEVEL.getLevelType(levelCode - 1);
- mallMembersAll = memberMapper.selectMemberWithLevelAndMemberId(levelType,mallMemberRef.getInviteId());
+ List<MallMember> mallMembersDirects = memberMapper.selectByRefererId(mallMemberRef.getInviteId());
+ for(MallMember memberDirect : mallMembersDirects){
+ List<MallMember> mallMembers1 = memberMapper.selectMemberWithLevelAndMemberId(levelType, memberDirect.getInviteId());
+ if(CollUtil.isEmpty(mallMembers1)){
+ continue;
+ }
+ mallMembersAll.add(memberDirect);
+ }
}else{
- mallMembersAll = memberMapper.selectMemberWithLevelAndMemberId(level,mallMemberRef.getInviteId());
+ String levelType = MemberLevelNewEnum.ZERO_LEVEL.getLevelType(0);
+ mallMembersAll = memberMapper.selectMemberWithLevelAndMemberId(levelType,mallMemberRef.getInviteId());
}
- if(teamCnt <= (CollUtil.isEmpty(mallMembersAll) ? 0 : mallMembersAll.size())){
+
+ Set<Long> collectAll = mallMembersAll.stream().map(MallMember::getId).collect(Collectors.toSet());
+ Collection<Long> intersection1 = CollUtil.intersection(collectAll, collect);
+ if(teamCnt <= (CollUtil.isEmpty(intersection1) ? 0 : intersection1.size())){
mallMemberRef.setLevel(level);
memberMapper.updateById(mallMemberRef);
--
Gitblit v1.9.1