From f52cfc92db48d9a215d7f728ce4000de1cdd6ae2 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Tue, 10 Sep 2024 09:55:31 +0800
Subject: [PATCH] 增加会员升级日志打印
---
src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java | 78 ++++++++++++++++++++++-----------------
1 files changed, 44 insertions(+), 34 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 8642dcf..6b1a582 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")));
+ }
}
}
}
@@ -1954,6 +1957,7 @@
@Override
public void memberLevelUp() {
+ log.info("会员等级升级");
/**
* 获取当前所有的已完成、未转换的买单的用户
*/
@@ -2019,7 +2023,7 @@
String levelType = MemberLevelNewEnum.ZERO_LEVEL.getLevelType(levelCode - 1);
List<MallMember> mallMembersDirects = memberMapper.selectByRefererId(mallMemberRef.getInviteId());
for(MallMember memberDirect : mallMembersDirects){
- List<MallMember> mallMembers1 = memberMapper.selectMemberWithLevelAndMemberId(levelType, memberDirect.getInviteId());
+ List<MallMember> mallMembers1 = memberMapper.selectMemberWithLevelAndMemberIdNew(levelType, memberDirect.getInviteId());
if(CollUtil.isEmpty(mallMembers1)){
continue;
}
@@ -2029,7 +2033,13 @@
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())){
+ if(!MemberLevelNewEnum.ZERO_LEVEL.getType().equals(level)){
+ log.info("{},有效人数为：{}，升级成为：{}，由于：{}",mallMemberRef.getAccountLogin(),intersection1,level,mallMember.getAccountLogin());
+ }
mallMemberRef.setLevel(level);
memberMapper.updateById(mallMemberRef);
--
Gitblit v1.9.1