fix

Helius

2022-06-16 1d41d6579bd3d10c5ed3d702d1ce4de10aab74dd

fix

 src/main/java/cc/mrbird/febs/mall/entity/AgentInfo.java

@@ -5,6 +5,8 @@
import java.math.BigDecimal;

/**
 *
 * {"teamIncome":"900","profitProp":20,"directCnt":"8","lastAgentCnt":"2"}
 * @author wzy
 * @date 2021-09-25
 **/
@@ -12,36 +14,22 @@
public class AgentInfo {

    /**
     * 下单数量要求 1-直推 2-团队
     * 团队业绩
     */
    private Integer orderType;
    public static final Integer ORDER_TYPE_DIRECT = 1;
    public static final Integer ORDER_TYPE_TEAM = 2;
    private BigDecimal teamIncome;

    /**
     * 下单数量
     * 代理收益比例
     */
    private Integer orderCnt;
    private BigDecimal profitProp;

    /**
     * 需要上一级的数量
     * 直推个数
     */
    private Integer lastCnt;
    private Integer directCnt;

    /**
     * 直推收益
     * 上一级代理数量
     */
    private BigDecimal directIncome;

    /**
     * 团队收益
     */
    private BigDecimal TeamIncome;

    /**
     * 团队收益 1-指定金额 2-比例
     */
    private Integer teamIncomeType;
    public static final Integer TEAM_INCOME_TYPE_AMOUNT = 1;
    public static final Integer TEAM_INCOME_TYPE_RATIO = 2;
    private Integer lastAgentCnt;
}

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

@@ -7,13 +7,11 @@
import cc.mrbird.febs.mall.entity.DataDictionaryCustom;
import cc.mrbird.febs.mall.entity.MallMember;
import cc.mrbird.febs.mall.entity.MallOrderInfo;
import cc.mrbird.febs.mall.mapper.DataDictionaryCustomMapper;
import cc.mrbird.febs.mall.mapper.MallMemberMapper;
import cc.mrbird.febs.mall.mapper.MallMemberWalletMapper;
import cc.mrbird.febs.mall.mapper.MallOrderInfoMapper;
import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.service.IAgentService;
import cc.mrbird.febs.mall.service.IApiMallMemberService;
import cc.mrbird.febs.mall.service.IApiMallMemberWalletService;
import cc.mrbird.febs.mall.service.IMallAchieveService;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
@@ -41,9 +39,6 @@

    private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
    private final MallMemberMapper memberMapper;
    private final MallOrderInfoMapper orderInfoMapper;
    private final IApiMallMemberWalletService memberWalletService;
    private final IApiMallMemberService memberService;

    @Override
    @Transactional(rollbackFor = Exception.class)
@@ -68,11 +63,15 @@
            }

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

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

            if (!teamIncome(parent, agentInfo)) {
                continue;
            }

@@ -82,22 +81,22 @@
    }

    /**
     * 判断用户直推下单数量或团队下单数量是否达标
     * 判断直推人数是否达标
     *
     * @param member
     * @return
     */
    private boolean orderCntFinish(MallMember member, AgentInfo agentInfo) {
        Integer cnt = 0;
        if (AgentInfo.ORDER_TYPE_DIRECT.equals(agentInfo.getOrderType())) {
            cnt = orderInfoMapper.selectCntDirect(member.getInviteId());
        } else {
            cnt = orderInfoMapper.selectCntDirectOrTeam(agentInfo.getOrderType(), member.getInviteId());
    private boolean directMemberCnt(MallMember member, AgentInfo agentInfo) {
        List<MallMember> childs = memberMapper.selectByRefererId(member.getInviteId());
        if (CollUtil.isEmpty(childs)) {
            return false;
        }

        if (cnt >= agentInfo.getOrderCnt()) {
        if (childs.size() >= agentInfo.getDirectCnt()) {
            return true;
        }
        log.info("用户{}订单未达标, 当前数量为:{},要求数量:{}, 当前等级为:{}", member.getPhone(), cnt, agentInfo.getOrderCnt(), member.getLevel());

        log.info("用户:{}直推数量未达标, 当前等级:{}, 当前数量:{}, 目标数量:{}", member.getPhone(), member.getLevel(), childs.size(), agentInfo.getLastAgentCnt());
        return false;
    }

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

@@ -126,128 +125,36 @@
            }
        }

        if (i >= agentInfo.getLastCnt()) {
        if (i >= agentInfo.getLastAgentCnt()) {
            return true;
        }

        log.info("用户:{}代理数量未达标, 当前等级:{}, 当前数量:{}, 目标数量:{}", member.getPhone(), member.getLevel(), i, agentInfo.getLastCnt());
        log.info("用户:{}代理数量未达标, 当前等级:{}, 当前数量:{}, 目标数量:{}", member.getPhone(), member.getLevel(), i, agentInfo.getLastAgentCnt());
        return false;
    }

    /**
     * 团队业绩是否达标
     *
     * @param mallMember
     * @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) {
            return true;
        }

        log.info("用户:{}团队业绩未达标, 当前等级:{}, 当前数量:{}, 目标数量:{}", member.getPhone(), member.getLevel(), totalIncome, targetIncome);
        return false;
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void returnMoneyToAgent(Long orderId) {
        MallOrderInfo orderInfo = orderInfoMapper.selectById(orderId);

        MallMember member = memberMapper.selectById(orderInfo.getMemberId());
        if (StrUtil.isBlank(member.getReferrerIds())) {
            return;
        }

        // 直推奖励
        directReturnMoney(member, orderInfo);
        // 团队奖励
        teamReturnMoney(member, orderInfo);
    }

    /**
     * 直推奖励
     * @param member
     */
    private void directReturnMoney(MallMember member, MallOrderInfo orderInfo) {
        MallMember parent = memberMapper.selectInfoByInviteId(member.getReferrerId());
        if (AgentLevelEnum.ZERO_LEVEL.name().equals(parent.getLevel())) {
            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;
            }

            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);
    }

    /**
     * 团队奖励
     *
     */
    public void teamReturnMoney(MallMember member, MallOrderInfo orderInfo) {
        List<String> inviteIds = StrUtil.split(member.getReferrerIds(), ',');
        List<MallMember> agentList = memberMapper.selectMemberParentAgentList(inviteIds, member.getReferrerId());
        if (CollUtil.isEmpty(agentList)) {
            return;
        }

        Map<String, Map<Long, BigDecimal>> needReturn = new HashMap<>();
        for (MallMember mallMember : agentList) {
            String level = mallMember.getLevel();

            List<MallMember> bigLevel = memberMapper.selectMallMemberByInviteIdAndLevel(mallMember.getInviteId(),level);
            if(CollUtil.isNotEmpty(bigLevel)){
                continue;
            }

            Map<Long, BigDecimal> amount = needReturn.get(level);

            // 按照代理关系，返到第二级，平级奖
            if (amount == null) {
                amount = new HashMap<>();
                AgentInfo agentInfo = getAgentInfo(level);
                if (agentInfo == null) {
                    continue;
                }

                BigDecimal returnMoney;
                if (AgentInfo.TEAM_INCOME_TYPE_AMOUNT.equals(agentInfo.getTeamIncomeType())) {
                    returnMoney = agentInfo.getTeamIncome();
                } else {
                    returnMoney = agentInfo.getTeamIncome().divide(BigDecimal.valueOf(100), 2, RoundingMode.DOWN).multiply(orderInfo.getAmount());
                }
                amount.put(mallMember.getId(), returnMoney);
            } else {
                if (!AgentLevelEnum.SECOND_LEVEL.name().equals(mallMember.getLevel())) {
                    // 代理两级
                    if (amount.size() >= 2) {
                        continue;
                    } else {
                        amount.put(mallMember.getId(), BigDecimal.ONE);
                    }
                }
            }

            needReturn.put(level, amount);
        }

        if(needReturn.isEmpty()) {
           return;
        }

        for (Map.Entry<String, Map<Long, BigDecimal>> entry : needReturn.entrySet()) {
            for (Map.Entry<Long, BigDecimal> amount : entry.getValue().entrySet()) {
                memberWalletService.addBalance(amount.getValue(), amount.getKey());

//                memberService.addMoneyFlow(amount.getKey(), amount.getValue(), MoneyFlowTypeEnum.ACHIEVE.getValue(), orderInfo.getOrderNo(), null, null, orderInfo.getMemberId(), null);
            }
        }
    }

    private AgentInfo getAgentInfo(String level) {
        DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.AGENT_LEVEL_REQUIRE, level);
        if (dic == null) {
            log.info("当前用户父级等级:{}", level);
            return null;
        }

        return JSONObject.parseObject(dic.getValue(), AgentInfo.class);
    }

    @Override

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

@@ -271,7 +271,7 @@
                }

                mallMoneyFlowService.addMoneyFlow(member.getId(), orderInfo.getAmount().negate(), MoneyFlowTypeEnum.PAY.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue());
//                agentProducer.sendAutoLevelUpMsg(member.getId());
                agentProducer.sendAutoLevelUpMsg(member.getId());
                agentProducer.sendOrderReturn(orderInfo.getId());
                break;
            case "4":

 src/main/java/cc/mrbird/febs/pay/service/impl/PayServiceImpl.java

@@ -105,7 +105,7 @@
        orderInfo.setPayTradeNo(params.get("trade_no"));
        orderInfoMapper.updateById(orderInfo);

        agentProducer.sendReturnMoneyMsg(orderInfo.getId());
//        agentProducer.sendReturnMoneyMsg(orderInfo.getId());
        agentProducer.sendAutoLevelUpMsg(orderInfo.getMemberId());

        memberService.addMoneyFlow(orderInfo.getMemberId(), orderInfo.getAmount().negate(), MoneyFlowTypeEnum.PAY.getValue(), orderInfo.getOrderNo(), null, null, null, null, FlowTypeEnum.BALANCE.getValue());