后台修改

xiaoyong931011

2023-04-10 2e655cbd32ff32ae5d836ccce7bc34a13ce80ffa

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

@@ -50,14 +50,9 @@
        List<String> ids = StrUtil.split(member.getReferrerIds(), ',');
        List<MallMember> parentMembers = memberMapper.selectByInviteIds(ids);
        for (MallMember parent : parentMembers) {
            /**
             * 升级到董事就无法升级了
             */
            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());
            if(CollUtil.isNotEmpty(mallMemberTeamMembers)){
                List<MallMember> levelV6List = mallMemberTeamMembers.stream()
                        .filter(teamMember -> teamMember.getLevel().equals(MemberLevelEnum.V6.getType()))
                        .collect(Collectors.toList());
@@ -68,6 +63,12 @@
                }
                continue;
            }

            /**
             * 升级到董事就无法升级了
             */
            String nextLevelName = MemberLevelEnum.NORMAL.getNextLevel(parent.getLevel());
            int levelCode = MemberLevelEnum.NORMAL.getLevelCode(nextLevelName);

            DataDictionaryCustom newLevelDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode("AGENT_PERK_SET", nextLevelName);

@@ -294,32 +295,15 @@
         */
        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.NORMAL.getType();
                    String levelNormal = MemberLevelEnum.V1.getType();
                BigDecimal cashPercentNormal = BigDecimal.ZERO;
                BigDecimal scorePercentNormal = BigDecimal.ZERO;

@@ -330,11 +314,12 @@
                for(MallMember teamPerkMember : mallMemberTeamPerk){
                    String level = teamPerkMember.getLevel();
                    //比较两个级别的大小，level大于levelNormal返回1
                    int compareLevel = MemberLevelEnum.V1.compareLevel(level, levelNormal);
                    if(compareLevel == 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(
                                MemberLevelEnum.V1.getType(), level);
                                    "AGENT_PERK_SET", level);

                        AdminAgentInfo adminAgentInfo = JSONObject.parseObject(teamPerkMemberDic.getValue(), AdminAgentInfo.class);
                        BigDecimal cashPercent = adminAgentInfo.getCashPercent().multiply(AppContants.PERCENTAGE);
@@ -367,11 +352,34 @@
                                    orderNo);
                        }
                        levelNormal = level;
                        cashPercentNormal = cashPercent;
                        scorePercentNormal = scorePercent;
                            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));
//                    }
//                }
            }


        }

        /**