From aa861e83f2a7a5f99ed30d448c129c2032b71af6 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 09 May 2023 09:39:58 +0800
Subject: [PATCH] 微信支付
---
src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 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 6ca5f55..7d98510 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,13 +50,22 @@
List<String> ids = StrUtil.split(member.getReferrerIds(), ',');
List<MallMember> parentMembers = memberMapper.selectByInviteIds(ids);
for (MallMember parent : parentMembers) {
- //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){
+ //level为v6，升级董事，则看直属团队下有没有两个V6
+ List<MallMember> mallMemberChilds = memberMapper.selectByRefererId(parent.getInviteId());
+ if(CollUtil.isNotEmpty(mallMemberChilds)){
+ int directorSize = 0;
+ for(MallMember mallMemberChild : mallMemberChilds){
+ List<MallMember> mallMemberTeamMembers = memberMapper.selectAllChildAgentListByInviteId(mallMemberChild.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)){
+ directorSize = directorSize +1;
+ }
+ }
+ }
+ if(directorSize >= 2){
parent.setLevel(MemberLevelEnum.V_DIRECTOR.getType());
parent.setDirector(AppContants.OPTION_YES);
memberMapper.updateById(parent);
@@ -419,7 +428,7 @@
);
if(poolScore.compareTo(BigDecimal.ZERO) > 0 && poolCash.compareTo(BigDecimal.ZERO) > 0){
- BigDecimal divide = poolCash.divide(poolScore, 7, BigDecimal.ROUND_DOWN);
+ BigDecimal divide = poolCash.divide(poolScore, 8, BigDecimal.ROUND_DOWN);
dataDictionaryCustomMapper.updateDicValueByTypeAndCode(
PerkEnum.POOL_SCORE_PRICE.getType(),
PerkEnum.POOL_SCORE_PRICE.getCode(),
--
Gitblit v1.9.1