From 8948d3e30d31fe7645c66e50d280c256dd3c4b5c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 20 Mar 2023 12:44:02 +0800
Subject: [PATCH] 后台修改
---
src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java | 49 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 34 insertions(+), 15 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 9f9d2c8..7659087 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
@@ -59,18 +59,20 @@
List<String> ids = StrUtil.split(member.getReferrerIds(), ',');
List<MallMember> parentMembers = memberMapper.selectByInviteIds(ids);
for (MallMember parent : parentMembers) {
- // 未激活用户无法升级
+ // 没有购买套餐无法升级合伙人等级
if (AgentLevelEnum.ZERO_LEVEL.name().equals(member.getLevel())) {
continue;
}
-
- DataDictionaryCustom nextLevel = dataDictionaryCustomMapper.selectNextAgentLevelInfo(parent.getLevel());
- if (nextLevel == null) {
+ //合伙人的下一个层级
+ String parentLevel = parent.getLevel();
+ String nextLevel = MemberLevelEnum.SECOND_LEVEL.getNextLevel(parentLevel);
+ if (parentLevel.equals(nextLevel)) {
log.info("当前层级无下一级:{}", parent.getLevel());
continue;
}
- AgentInfo agentInfo = JSONObject.parseObject(nextLevel.getValue(), AgentInfo.class);
+ DataDictionaryCustom nextLevelDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode("AGENT_LEVEL_REQUIRE", nextLevel);
+ AgentInfo agentInfo = JSONObject.parseObject(nextLevelDic.getValue(), AgentInfo.class);
if (!directMemberCnt(parent, agentInfo)) {
continue;
}
@@ -83,7 +85,7 @@
continue;
}
- parent.setLevel(nextLevel.getCode());
+ parent.setLevel(nextLevel);
memberMapper.updateById(parent);
}
}
@@ -104,7 +106,7 @@
return true;
}
- log.info("用户:{}直推数量未达标, 当前等级:{}, 当前数量:{}, 目标数量:{}", member.getPhone(), member.getLevel(), childs.size(), agentInfo.getLastAgentCnt());
+ log.info("用户:{}直推数量未达标, 当前等级:{}, 当前数量:{}, 目标数量:{}", member.getPhone(), member.getLevel(), childs.size(), agentInfo.getDirectCnt());
return false;
}
@@ -142,20 +144,24 @@
}
/**
- * 团队业绩是否达标
+ * 团队贡献点是否达标
*
* @param agentInfo
* @return
*/
private boolean teamIncome(MallMember member, AgentInfo agentInfo) {
- BigDecimal totalIncome = memberMapper.selectAchieveByMemberId(member.getInviteId(), 2);
- BigDecimal targetIncome = agentInfo.getTeamIncome().multiply(new BigDecimal("10000"));
- if (totalIncome.compareTo(targetIncome) >= 0) {
+ List<MallMember> mallMembers = memberMapper.selectAllChildAgentListByInviteId(member.getInviteId());
+ List<Long> ids = mallMembers.stream().map(MallMember::getId).collect(Collectors.toList());
+ List<MallMemberWallet> mallMemberWallets = mallMemberWalletMapper.selectMemberWalletsByIds(ids);
+
+ int starSum = mallMemberWallets.stream().mapToInt(MallMemberWallet::getStar).sum();
+ BigDecimal teamIncome = agentInfo.getTeamIncome();
+ if (teamIncome.compareTo(new BigDecimal(starSum)) <= 0) {
return true;
}
- log.info("用户:{}团队业绩未达标, 当前等级:{}, 当前数量:{}, 目标数量:{}", member.getPhone(), member.getLevel(), totalIncome, targetIncome);
+ log.info("用户:{}团队贡献点未达标, 当前等级:{}, 当前数量:{}, 目标数量:{}", member.getPhone(), member.getLevel(), starSum, teamIncome);
return false;
}
@@ -216,7 +222,12 @@
sharePerkAmount,
MoneyFlowTypeEnum.DYNAMIC_ACHIEVE.getValue(),
mallOrderInfo.getOrderNo(),
- FlowTypeEnum.BALANCE.getValue());
+ "直推奖",
+ "补贴额度："+totalScore,
+ memberId,
+ 2,
+ FlowTypeEnum.BALANCE.getValue(),
+ 1);
}
}
/**
@@ -275,8 +286,14 @@
Map<String, List<MallMember>> collect = mallMembers.stream().collect(Collectors.groupingBy(MallMember::getLevel));
Set<String> set = collect.keySet(); // 得到所有key的集合
for (String key : set) {
- List<MallMember> value = collect.get(key);
- mallMemberTeamPerk.add(value.get(0));
+ /**
+ * 团队补贴从二星开始
+ */
+ int compareLevel = MemberLevelEnum.SECOND_LEVEL.compareLevel(key, MemberLevelEnum.SECOND_LEVEL.getType());
+ if(compareLevel > 0){
+ List<MallMember> value = collect.get(key);
+ mallMemberTeamPerk.add(value.get(0));
+ }
}
}
@@ -375,6 +392,7 @@
mallMoneyFlow.setOrderNo(orderNo);
mallMoneyFlow.setRtMemberId(memberId);
mallMoneyFlow.setStatus(2);
+ mallMoneyFlow.setRemark("补贴额度："+mallMemberWallet.getTotalScore());
mallMoneyFlow.setFlowType(FlowTypeEnum.BALANCE.getValue());
mallMoneyFlows.add(mallMoneyFlow);
}
@@ -451,6 +469,7 @@
mallMoneyFlow.setOrderNo(orderNo);
mallMoneyFlow.setRtMemberId(memberId);
mallMoneyFlow.setStatus(2);
+ mallMoneyFlow.setRemark("补贴额度："+mallMemberWallet.getTotalScore());
mallMoneyFlow.setFlowType(FlowTypeEnum.BALANCE.getValue());
mallMoneyFlows.add(mallMoneyFlow);
}
--
Gitblit v1.9.1