版本管理

xiaoyong931011

2023-10-25 b3c8303ecd936182e2df4933dbf1ad167b81266e

 src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java

@@ -50,18 +50,31 @@
        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){
                    parent.setLevel(MemberLevelEnum.V_DIRECTOR.getType());
                    parent.setDirector(AppContants.OPTION_YES);
                    memberMapper.updateById(parent);
                    continue;
                }
            //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;
//                }
//            }
            //V6不能再升级了
            if(parent.getLevel().equals(MemberLevelEnum.V6.getType())){
                continue;
            }

            /**
@@ -217,7 +230,7 @@
        if(BigDecimal.ZERO.compareTo(amountTCAll) >= 0){
            return;
        }
        BigDecimal amountTC = new BigDecimal(1000);
        BigDecimal amountTC = new BigDecimal(100);
        //购买套餐按照1000的基数去补贴，如5000，则补贴5次1000
        int times = amountTCAll.divideToIntegralValue(amountTC).intValue();
        if(times < 1){
@@ -419,7 +432,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(),
@@ -520,12 +533,12 @@
    }

    public static void main(String[] args) {
        BigDecimal total = new BigDecimal(10000000);
        BigDecimal total = new BigDecimal(100000);

        BigDecimal amountTotal = BigDecimal.ZERO;
        BigDecimal scoreTotal = BigDecimal.ZERO;

        BigDecimal amountBasic = new BigDecimal(1000);
        BigDecimal amountBasic = new BigDecimal(100);
        BigDecimal price = new BigDecimal(0.01);

        BigDecimal amountPercent = new BigDecimal(0.5);