From c947945f2c3631bd5fb4033f6a34fed6e4345c62 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 11 Apr 2023 15:54:42 +0800
Subject: [PATCH] 后台修改
---
src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java | 212 ++++++++++++++++++++++++++++------------------------
1 files changed, 115 insertions(+), 97 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 06c2285..39212ca 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
@@ -50,24 +50,26 @@
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;
-// }
+ //level为v6，升级董事，则看团队下有没有两个V6
+ List<MallMember> mallMemberTeamMembers = memberMapper.selectAllChildAgentListByInviteId(parent.getInviteId());
+ if(CollUtil.isNotEmpty(mallMemberTeamMembers)){
+ 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;
+ }
+
/**
* 升级到董事就无法升级了
*/
String nextLevelName = MemberLevelEnum.NORMAL.getNextLevel(parent.getLevel());
int levelCode = MemberLevelEnum.NORMAL.getLevelCode(nextLevelName);
- if(levelCode >= 7){
- continue;
- }
-// DataDictionaryCustom nextLevel = dataDictionaryCustomMapper.selectNextAgentLevelInfo(parent.getLevel());
-// if (nextLevel == null) {
-// log.info("当前层级无下一级:{}", parent.getLevel());
-// continue;
-// }
DataDictionaryCustom newLevelDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode("AGENT_PERK_SET", nextLevelName);
AdminAgentInfo adminAgentInfo = JSONObject.parseObject(newLevelDic.getValue(), AdminAgentInfo.class);
@@ -75,15 +77,11 @@
continue;
}
-// if (!agentCntFinish(parent, adminAgentInfo)) {
-// continue;
-// }
-
if (!teamIncome(parent, adminAgentInfo)) {
continue;
}
- parent.setLevel(newLevelDic.getCode());
+ parent.setLevel(nextLevelName);
memberMapper.updateById(parent);
}
}
@@ -155,7 +153,7 @@
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){
@@ -163,17 +161,31 @@
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) {
-// return true;
-// }
-//
-// log.info("用户:{}团队业绩未达标, 当前等级:{}, 当前数量:{}, 目标数量:{}", member.getPhone(), member.getLevel(), totalIncome, targetIncome);
+ if (teamIncomeMax.compareTo(teamIncome) >= 0) {
+ return true;
+ }
+ 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
@@ -283,84 +295,91 @@
*/
if(StrUtil.isNotEmpty(mallMember.getReferrerIds())){
//团队补贴对象
- List<MallMember> mallMemberTeamPerk = new ArrayList<>();
+// List<MallMember> mallMemberTeamPerk = new ArrayList<>();
String referrerIds = mallMember.getReferrerIds();
List<String> referrerIdList = StrUtil.splitTrim(referrerIds, ",");
if(CollUtil.isNotEmpty(referrerIdList)){
- List<MallMember> mallMembers = mallMemberMapper.selectByInviteIds(referrerIdList);
- /**
- * 根据等级分组，获取对应的<级别，会员数组>map
- */
- Map<String, List<MallMember>> collect = mallMembers.stream().collect(Collectors.groupingBy(MallMember::getLevel));
- Set<String> set = collect.keySet(); // 得到所有key的集合
- for (String key : set) {
- /**
- * 团队补贴从v1到v6
- */
- int compareMin = MemberLevelEnum.V1.compareLevel(key, MemberLevelEnum.V1.getType());
- int compareMax = MemberLevelEnum.V1.compareLevel(MemberLevelEnum.V6.getType(), key);
- if(compareMin >= 1 && compareMax >= 1){
- List<MallMember> value = collect.get(key);
- mallMemberTeamPerk.add(value.get(0));
+ List<MallMember> mallMemberTeamPerk = mallMemberMapper.selectByInviteIds(referrerIdList);
+
+ if(CollUtil.isNotEmpty(mallMemberTeamPerk)){
+ String levelNormal = MemberLevelEnum.V1.getType();
+ BigDecimal cashPercentNormal = BigDecimal.ZERO;
+ BigDecimal scorePercentNormal = BigDecimal.ZERO;
+
+ DataDictionaryCustom poolScorePriceDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ PerkEnum.POOL_SCORE_PRICE.getType(),
+ PerkEnum.POOL_SCORE_PRICE.getCode());
+ BigDecimal poolScorePrice = new BigDecimal(poolScorePriceDic.getValue() == null ? "1" : poolScorePriceDic.getValue());
+ for(MallMember teamPerkMember : mallMemberTeamPerk){
+ String level = teamPerkMember.getLevel();
+ //比较两个级别的大小，level大于levelNormal返回1
+ int compareMin = MemberLevelEnum.V1.compareLevel(level, levelNormal);
+ int compareMax = MemberLevelEnum.V1.compareLevel(MemberLevelEnum.V6.getType(), level);
+ if(compareMin >= 1 && compareMax >= 1){
+ Long teamPerkMemberId = teamPerkMember.getId();
+ DataDictionaryCustom teamPerkMemberDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ "AGENT_PERK_SET", level);
+
+ AdminAgentInfo adminAgentInfo = JSONObject.parseObject(teamPerkMemberDic.getValue(), AdminAgentInfo.class);
+ BigDecimal cashPercent = adminAgentInfo.getCashPercent().multiply(AppContants.PERCENTAGE);
+ BigDecimal scorePercent = adminAgentInfo.getScorePercent().multiply(AppContants.PERCENTAGE);
+ //极差
+ cashPercent = cashPercent.subtract(cashPercentNormal);
+ scorePercent = scorePercent.subtract(scorePercentNormal);
+
+ BigDecimal cashAmount = amountTC.multiply(cashPercent).setScale(2, BigDecimal.ROUND_DOWN);
+
+ //如果是积分，除以当前价格，得到数量。
+ BigDecimal scoreCnt = amountTC.multiply(scorePercent).setScale(2, BigDecimal.ROUND_DOWN);
+ scoreCnt = scoreCnt.divide(poolScorePrice, 2 ,BigDecimal.ROUND_DOWN);
+ if(cashAmount.compareTo(BigDecimal.ZERO) > 0){
+ addWalletInfoAndMoneyFlow(cashAmount,
+ teamPerkMemberId,
+ "balance",
+ MoneyFlowTypeEnum.AGENT_CASH_PERK.getValue(),
+ memberId,
+ FlowTypeEnum.BALANCE.getValue(),
+ orderNo);
+ }
+ if(scoreCnt.compareTo(BigDecimal.ZERO) > 0){
+ addWalletInfoAndMoneyFlow(scoreCnt,
+ teamPerkMemberId,
+ "score",
+ MoneyFlowTypeEnum.AGENT_SCORE_PERK.getValue(),
+ memberId,
+ FlowTypeEnum.SCORE.getValue(),
+ orderNo);
+ }
+ levelNormal = level;
+ cashPercentNormal = adminAgentInfo.getCashPercent().multiply(AppContants.PERCENTAGE);
+ scorePercentNormal = adminAgentInfo.getScorePercent().multiply(AppContants.PERCENTAGE);
+ }
}
}
+
+// for(MallMember levelMember : mallMembers){
+// String level = levelMember.getLevel();
+// }
+// /**
+// * 根据等级分组，获取对应的<级别，会员数组>map todo 目前获取到的levelMember是无序的
+// */
+// Map<String, List<MallMember>> collect = mallMembers.stream().collect(Collectors.groupingBy(MallMember::getLevel));
+// Set<String> set = collect.keySet(); // 得到所有key的集合
+// for (String key : set) {
+// /**
+// * 团队补贴从v1到v6
+// */
+// int compareMin = MemberLevelEnum.V1.compareLevel(key, MemberLevelEnum.V1.getType());
+// int compareMax = MemberLevelEnum.V1.compareLevel(MemberLevelEnum.V6.getType(), key);
+// if(compareMin >= 1 && compareMax >= 1){
+// List<MallMember> value = collect.get(key);
+// mallMemberTeamPerk.add(value.get(0));
+// }
+// }
}
- if(CollUtil.isNotEmpty(mallMemberTeamPerk)){
- String levelNormal = MemberLevelEnum.NORMAL.getType();
- BigDecimal cashPercentNormal = BigDecimal.ZERO;
- BigDecimal scorePercentNormal = BigDecimal.ZERO;
- DataDictionaryCustom poolScorePriceDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
- PerkEnum.POOL_SCORE_PRICE.getType(),
- PerkEnum.POOL_SCORE_PRICE.getCode());
- BigDecimal poolScorePrice = new BigDecimal(poolScorePriceDic.getValue() == null ? "1" : poolScorePriceDic.getValue());
- for(MallMember teamPerkMember : mallMemberTeamPerk){
- String level = teamPerkMember.getLevel();
- //比较两个级别的大小，level大于levelNormal返回1
- int compareLevel = MemberLevelEnum.V1.compareLevel(level, levelNormal);
- if(compareLevel == 1){
- Long teamPerkMemberId = teamPerkMember.getId();
- DataDictionaryCustom teamPerkMemberDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
- MemberLevelEnum.V1.getType(), level);
-
- AdminAgentInfo adminAgentInfo = JSONObject.parseObject(teamPerkMemberDic.getValue(), AdminAgentInfo.class);
- BigDecimal cashPercent = adminAgentInfo.getCashPercent().multiply(AppContants.PERCENTAGE);
- BigDecimal scorePercent = adminAgentInfo.getScorePercent().multiply(AppContants.PERCENTAGE);
- //极差
- cashPercent = cashPercent.subtract(cashPercentNormal);
- scorePercent = scorePercent.subtract(scorePercentNormal);
-
- BigDecimal cashAmount = amountTC.multiply(cashPercent).setScale(2, BigDecimal.ROUND_DOWN);
-
- //如果是积分，除以当前价格，得到数量。
- BigDecimal scoreCnt = amountTC.multiply(scorePercent).setScale(2, BigDecimal.ROUND_DOWN);
- scoreCnt = scoreCnt.divide(poolScorePrice, 2 ,BigDecimal.ROUND_DOWN);
- if(cashAmount.compareTo(BigDecimal.ZERO) > 0){
- addWalletInfoAndMoneyFlow(cashAmount,
- teamPerkMemberId,
- "balance",
- MoneyFlowTypeEnum.AGENT_CASH_PERK.getValue(),
- memberId,
- FlowTypeEnum.BALANCE.getValue(),
- orderNo);
- }
- if(scoreCnt.compareTo(BigDecimal.ZERO) > 0){
- addWalletInfoAndMoneyFlow(scoreCnt,
- teamPerkMemberId,
- "score",
- MoneyFlowTypeEnum.AGENT_SCORE_PERK.getValue(),
- memberId,
- FlowTypeEnum.SCORE.getValue(),
- orderNo);
- }
- levelNormal = level;
- cashPercentNormal = cashPercent;
- scorePercentNormal = scorePercent;
- }
- }
- }
}
/**
@@ -387,7 +406,6 @@
PerkEnum.POOL_CASH.getCode(),
poolCash.toString()
);
-
DataDictionaryCustom poolScorePriceDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
PerkEnum.POOL_SCORE_PRICE.getType(),
--
Gitblit v1.9.1