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 | 62 +++++++++++++++++++++++-------- 1 files changed, 46 insertions(+), 16 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 e05cfc5..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,18 +50,27 @@ 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); + continue; } - continue; } /** @@ -71,6 +80,9 @@ int levelCode = MemberLevelEnum.NORMAL.getLevelCode(nextLevelName); DataDictionaryCustom newLevelDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode("AGENT_PERK_SET", nextLevelName); + if(ObjectUtil.isEmpty(newLevelDic)){ + continue; + } AdminAgentInfo adminAgentInfo = JSONObject.parseObject(newLevelDic.getValue(), AdminAgentInfo.class); if (!directMemberCnt(parent, adminAgentInfo)) { @@ -214,9 +226,9 @@ if(BigDecimal.ZERO.compareTo(amountTCAll) >= 0){ return; } - BigDecimal amountTC = new BigDecimal(1000); + BigDecimal amountTC = new BigDecimal(100); //购买套餐按照1000的基数去补贴,如5000,则补贴5次1000 - int times = Integer.parseInt(amountTCAll.divideToIntegralValue(amountTC).toString()); + int times = amountTCAll.divideToIntegralValue(amountTC).intValue(); if(times < 1){ return; } @@ -416,7 +428,7 @@ ); if(poolScore.compareTo(BigDecimal.ZERO) > 0 && poolCash.compareTo(BigDecimal.ZERO) > 0){ - BigDecimal divide = poolCash.divide(poolScore, 6, BigDecimal.ROUND_DOWN); + BigDecimal divide = poolCash.divide(poolScore, 8, BigDecimal.ROUND_DOWN); dataDictionaryCustomMapper.updateDicValueByTypeAndCode( PerkEnum.POOL_SCORE_PRICE.getType(), PerkEnum.POOL_SCORE_PRICE.getCode(), @@ -517,10 +529,28 @@ } public static void main(String[] args) { - BigDecimal amountTCAll = new BigDecimal(900); - BigDecimal amountTCBasicAmount = new BigDecimal(1000); - //购买套餐按照1000的基数去补贴,如5000,则补贴5次1000 - BigDecimal bigDecimal = amountTCAll.divideToIntegralValue(amountTCBasicAmount); - System.out.println(bigDecimal); + BigDecimal total = new BigDecimal(100000); + + BigDecimal amountTotal = BigDecimal.ZERO; + BigDecimal scoreTotal = BigDecimal.ZERO; + + BigDecimal amountBasic = new BigDecimal(100); + BigDecimal price = new BigDecimal(0.01); + + BigDecimal amountPercent = new BigDecimal(0.5); + BigDecimal scorePercent = new BigDecimal(0.35); + int times = total.divideToIntegralValue(amountBasic).intValue(); + + System.out.println("循环次数:"+times); + for(int i = 0; i < times; i++){ + BigDecimal amount = amountBasic.multiply(amountPercent); + amountTotal = amountTotal.add(amount); + + BigDecimal score = amountBasic.multiply(scorePercent).divide(price, 2 ,BigDecimal.ROUND_DOWN); + scoreTotal = scoreTotal.add(score); + price = amountTotal.divide(scoreTotal, 7 ,BigDecimal.ROUND_DOWN); + + System.out.println("现金池:"+amountTotal+",积分池:"+scoreTotal+",增长现金:"+amount+"增长积分:"+score+",价格:"+price); + } } } -- Gitblit v1.9.1