xiaoyong931011
2023-03-14 e5cad818bcfa817ffe7f2af7885cb3b97dbd0ad7
合伙人升级MQ
5 files modified
64 ■■■■ changed files
src/main/java/cc/mrbird/febs/common/enumerates/MemberLevelEnum.java 24 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java 30 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java 3 ●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java 3 ●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/rabbit/consumer/AgentConsumer.java 4 ●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/common/enumerates/MemberLevelEnum.java
@@ -43,6 +43,30 @@
        return codeOne;
    }
    public String getNextLevel(String Level){
        String levelNext = Level;
        int codeOne = 0;
        for (MemberLevelEnum value : MemberLevelEnum.values()) {
            if(value.type.equals(Level)){
                codeOne = value.code;
                break;
            }
        }
        codeOne = codeOne + 1;
        for (MemberLevelEnum value : MemberLevelEnum.values()) {
            if(value.code == (codeOne)){
                levelNext = value.type;
                break;
            }
        }
        return levelNext;
    }
//    public static void main(String[] args) {
//        String zero_level = MemberLevelEnum.SECOND_LEVEL.getNextLevel("SIX_LEVEL");
//        System.out.println(zero_level);
//    }
    /**
     * 比较两个级别的大小,levelOne大于levelTwo返回1,否则返回0
     */
src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
@@ -59,18 +59,20 @@
        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;
            }
            DataDictionaryCustom nextLevel = dataDictionaryCustomMapper.selectNextAgentLevelInfo(parent.getLevel());
            if (nextLevel == null) {
            //合伙人的下一个层级
            String parentLevel = parent.getLevel();
            String nextLevel = MemberLevelEnum.SECOND_LEVEL.getNextLevel(parentLevel);
            if (parentLevel.equals(nextLevel)) {
                log.info("当前层级无下一级:{}", parent.getLevel());
                continue;
            }
            AgentInfo agentInfo = JSONObject.parseObject(nextLevel.getValue(), AgentInfo.class);
            DataDictionaryCustom nextLevelDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode("AGENT_LEVEL_REQUIRE", nextLevel);
            AgentInfo agentInfo = JSONObject.parseObject(nextLevelDic.getValue(), AgentInfo.class);
            if (!directMemberCnt(parent, agentInfo)) {
                continue;
            }
@@ -83,7 +85,7 @@
                continue;
            }
            parent.setLevel(nextLevel.getCode());
            parent.setLevel(nextLevel);
            memberMapper.updateById(parent);
        }
    }
@@ -104,7 +106,7 @@
            return true;
        }
        log.info("用户:{}直推数量未达标, 当前等级:{}, 当前数量:{}, 目标数量:{}", member.getPhone(), member.getLevel(), childs.size(), agentInfo.getLastAgentCnt());
        log.info("用户:{}直推数量未达标, 当前等级:{}, 当前数量:{}, 目标数量:{}", member.getPhone(), member.getLevel(), childs.size(), agentInfo.getDirectCnt());
        return false;
    }
@@ -142,20 +144,24 @@
    }
    /**
     * 团队业绩是否达标
     * 团队贡献点是否达标
     *
     * @param agentInfo
     * @return
     */
    private boolean teamIncome(MallMember member, AgentInfo agentInfo) {
        BigDecimal totalIncome = memberMapper.selectAchieveByMemberId(member.getInviteId(), 2);
        BigDecimal targetIncome = agentInfo.getTeamIncome().multiply(new BigDecimal("10000"));
        if (totalIncome.compareTo(targetIncome) >= 0) {
        List<MallMember> mallMembers = memberMapper.selectAllChildAgentListByInviteId(member.getInviteId());
        List<Long> ids = mallMembers.stream().map(MallMember::getId).collect(Collectors.toList());
        List<MallMemberWallet> mallMemberWallets = mallMemberWalletMapper.selectMemberWalletsByIds(ids);
        int starSum = mallMemberWallets.stream().mapToInt(MallMemberWallet::getStar).sum();
        BigDecimal teamIncome = agentInfo.getTeamIncome();
        if (teamIncome.compareTo(new BigDecimal(starSum)) <= 0) {
            return true;
        }
        log.info("用户:{}团队业绩未达标, 当前等级:{}, 当前数量:{}, 目标数量:{}", member.getPhone(), member.getLevel(), totalIncome, targetIncome);
        log.info("用户:{}团队贡献点未达标, 当前等级:{}, 当前数量:{}, 目标数量:{}", member.getPhone(), member.getLevel(), starSum, teamIncome);
        return false;
    }
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -351,7 +351,8 @@
                changeWallet(orderInfo.getId());
                //发送补贴消息
                agentProducer.sendPerkMoneyMsg(orderInfo.getId());
//                agentProducer.sendOrderReturn(orderInfo.getId());
                //发送代理自动升级消息
                agentProducer.sendAutoLevelUpMsg(member.getId());
                break;
            case "4":
                if (orderInfo.getOrderType() != 2) {
src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java
@@ -148,7 +148,8 @@
    @Override
    public void dynamicProfit(Long orderId) {
        dynamicProfit(orderId, 2);
        return;
//        dynamicProfit(orderId, 2);
    }
    /**
src/main/java/cc/mrbird/febs/rabbit/consumer/AgentConsumer.java
@@ -45,11 +45,11 @@
    @RabbitListener(queues = QueueConstants.AGENT_AUTO_LEVEL_UP)
    public void agentAutoLevelUp(String id) {
        log.info("收到代理自动升级消息:{}", id);
        log.info("收到合伙人自动升级消息:{}", id);
        try {
            agentService.autoUpAgentLevel(Long.parseLong(id));
        } catch (Exception e) {
            log.error("代理自动升级异常", e);
            log.error("合伙人自动升级异常", e);
        }
    }