fix

Helius

2021-09-29 aa02a165eea629fa89d1ff47531ce861cd9fa3bc

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

@@ -53,27 +53,27 @@
            return;
        }

        // 未激活用户无法升级
        if (AgentLevelEnum.ZERO_LEVEL.name().equals(member.getLevel())) {
            return;
        }

        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) {
                log.info("当前层级无下一级:{}", parent.getLevel());
                return;
                continue;
            }

            AgentInfo agentInfo = JSONObject.parseObject(nextLevel.getValue(), AgentInfo.class);
            if (!orderCntFinish(parent, agentInfo)) {
                return;
                continue;
            }

            if (!agentCntFinish(parent, agentInfo)) {
                return;
                continue;
            }

            parent.setLevel(nextLevel.getCode());
@@ -107,7 +107,7 @@
     * @return
     */
    private boolean agentCntFinish(MallMember member, AgentInfo agentInfo) {
        if (agentInfo.getLastCnt() == null) {
        if (agentInfo.getLastCnt() == null || agentInfo.getLastCnt() == 0) {
            return true;
        }

@@ -156,16 +156,21 @@
     */
    private void directReturnMoney(MallMember member, MallOrderInfo orderInfo) {
        MallMember parent = memberMapper.selectInfoByInviteId(member.getReferrerId());
        if (AgentLevelEnum.FIRST_LEVEL.name().equals(parent.getLevel()) || AgentLevelEnum.ZERO_LEVEL.name().equals(parent.getLevel())) {
        if (AgentLevelEnum.ZERO_LEVEL.name().equals(parent.getLevel())) {
            return;
        }

        AgentInfo agentInfo = getAgentInfo(parent.getLevel());
        if (agentInfo == null) {
            return;
        }
        BigDecimal returnMoney;
        if (AgentLevelEnum.FIRST_LEVEL.name().equals(parent.getLevel())) {
            returnMoney = BigDecimal.valueOf(0.3).multiply(orderInfo.getAmount());
        } else {
            AgentInfo agentInfo = getAgentInfo(parent.getLevel());
            if (agentInfo == null) {
                return;
            }

        BigDecimal returnMoney = agentInfo.getDirectIncome().divide(BigDecimal.valueOf(100), 2,RoundingMode.DOWN).multiply(orderInfo.getAmount());
            returnMoney = agentInfo.getDirectIncome().divide(BigDecimal.valueOf(100), 2,RoundingMode.DOWN).multiply(orderInfo.getAmount());
        }
        memberWalletService.addBalance(returnMoney, parent.getId());

        memberService.addMoneyFlow(parent.getId(), returnMoney, MoneyFlowTypeEnum.BONUS.getValue(), orderInfo.getOrderNo(), null, null, orderInfo.getMemberId(), null);
@@ -177,7 +182,7 @@
     */
    public void teamReturnMoney(MallMember member, MallOrderInfo orderInfo) {
        List<String> inviteIds = StrUtil.split(member.getReferrerIds(), ',');
        List<MallMember> agentList = memberMapper.selectMemberParentAgentList(inviteIds);
        List<MallMember> agentList = memberMapper.selectMemberParentAgentList(inviteIds, member.getReferrerId());
        if (CollUtil.isEmpty(agentList)) {
            return;
        }