From 66fdac21a55b328a963a149e38252f9cc02143d0 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 10 Apr 2023 11:46:52 +0800
Subject: [PATCH] 后台修改
---
src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java | 86 +++++++++++++++++++++++++++++++------------
1 files changed, 62 insertions(+), 24 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 a356f36..a79369c 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
@@ -5,6 +5,8 @@
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.service.*;
+import cc.mrbird.febs.mall.vo.AdminAgentLevelVo;
+import cc.mrbird.febs.mall.vo.AdminAgentMemberVo;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
@@ -48,31 +50,37 @@
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())) {
+ /**
+ * 升级到董事就无法升级了
+ */
+ String nextLevelName = MemberLevelEnum.NORMAL.getNextLevel(parent.getLevel());
+ int levelCode = MemberLevelEnum.NORMAL.getLevelCode(nextLevelName);
+ if(levelCode == 8){
+ //level为v6，升级董事，则看团队下有没有两个V6
+ List<MallMember> mallMemberTeamMembers = memberMapper.selectAllChildAgentListByInviteId(parent.getInviteId());
+ List<MallMember> levelV6List = mallMemberTeamMembers.stream()
+ .filter(teamMember -> teamMember.getLevel().equals(MemberLevelEnum.V6.getType()))
+ .collect(Collectors.toList());
+ if(CollUtil.isNotEmpty(levelV6List) && levelV6List.size() >= 2){
+ parent.setLevel(MemberLevelEnum.V_DIRECTOR.getType());
+ parent.setDirector(AppContants.OPTION_YES);
+ memberMapper.updateById(parent);
+ }
continue;
}
- DataDictionaryCustom nextLevel = dataDictionaryCustomMapper.selectNextAgentLevelInfo(parent.getLevel());
- if (nextLevel == null) {
- log.info("当前层级无下一级:{}", parent.getLevel());
+ DataDictionaryCustom newLevelDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode("AGENT_PERK_SET", nextLevelName);
+
+ AdminAgentInfo adminAgentInfo = JSONObject.parseObject(newLevelDic.getValue(), AdminAgentInfo.class);
+ if (!directMemberCnt(parent, adminAgentInfo)) {
continue;
}
- AgentInfo agentInfo = JSONObject.parseObject(nextLevel.getValue(), AgentInfo.class);
- if (!directMemberCnt(parent, agentInfo)) {
+ if (!teamIncome(parent, adminAgentInfo)) {
continue;
}
- if (!agentCntFinish(parent, agentInfo)) {
- continue;
- }
-
- if (!teamIncome(parent, agentInfo)) {
- continue;
- }
-
- parent.setLevel(nextLevel.getCode());
+ parent.setLevel(nextLevelName);
memberMapper.updateById(parent);
}
}
@@ -83,7 +91,7 @@
* @param member
* @return
*/
- private boolean directMemberCnt(MallMember member, AgentInfo agentInfo) {
+ private boolean directMemberCnt(MallMember member, AdminAgentInfo agentInfo) {
List<MallMember> childs = memberMapper.selectByRefererId(member.getInviteId());
if (CollUtil.isEmpty(childs)) {
return false;
@@ -93,7 +101,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;
}
@@ -132,23 +140,53 @@
/**
* 团队业绩是否达标
+ * 除去直属的最大的一个业绩团队，剩余的所有业绩之和
*
* @param
* @param agentInfo
* @return
*/
- private boolean teamIncome(MallMember member, AgentInfo agentInfo) {
- BigDecimal totalIncome = memberMapper.selectAchieveByMemberId(member.getInviteId(), 2);
+ private boolean teamIncome(MallMember member, AdminAgentInfo agentInfo) {
+ BigDecimal teamIncome = agentInfo.getTeamIncome();
+ //业绩集合
+ List<BigDecimal> list = new ArrayList<>();
+ //总业绩
+ BigDecimal teamIncomeMax = BigDecimal.ZERO;
+ //所有直推团队，就是这个会员的所有区域的业绩。
+ List<MallMember> mallMembers = mallMemberMapper.selectByRefererId(member.getInviteId());
+ List<String> mallMemberInviteIds = mallMembers.stream().map(MallMember::getInviteId).collect(Collectors.toList());
+ for(String inviteId : mallMemberInviteIds){
+ BigDecimal totalIncomeMember = memberMapper.selectAllAchieveByInviteId(inviteId);
+ teamIncomeMax = teamIncomeMax.add(totalIncomeMember);
+ list.add(totalIncomeMember);
+ }
+ //去掉一个最大区的业绩
+ BigDecimal bigMax = list.stream().max(BigDecimal::compareTo).get();
+ teamIncomeMax = teamIncomeMax.subtract(bigMax);
- BigDecimal targetIncome = agentInfo.getTeamIncome().multiply(new BigDecimal("10000"));
- if (totalIncome.compareTo(targetIncome) >= 0) {
+ if (teamIncomeMax.compareTo(teamIncome) >= 0) {
return true;
}
-
- log.info("用户:{}团队业绩未达标, 当前等级:{}, 当前数量:{}, 目标数量:{}", member.getPhone(), member.getLevel(), totalIncome, targetIncome);
+ log.info("用户:{}团队业绩未达标, 当前等级:{}, 当前业绩:{}, 目标业绩:{}", member.getPhone(), member.getLevel(), teamIncomeMax, teamIncome);
return false;
}
+ public static void main(String[] args) {
+ BigDecimal q = new BigDecimal("100");
+ BigDecimal q1 = new BigDecimal("99");
+ BigDecimal q2 = new BigDecimal("100");
+ BigDecimal q3= new BigDecimal("88");
+
+ List<BigDecimal> list = new ArrayList<>();
+ list.add(q);
+ list.add(q1);
+ list.add(q2);
+ list.add(q3);
+
+ BigDecimal bigMax = list.stream().max(BigDecimal::compareTo).get();
+ System.out.println(bigMax);
+ }
+
@Override
@Transactional(rollbackFor = Exception.class)
public void returnMoneyToAgent(Long orderId) {
--
Gitblit v1.9.1