src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
@@ -3,6 +3,8 @@
import cc.mrbird.febs.common.enumerates.*;
import cc.mrbird.febs.common.utils.AppContants;
import cc.mrbird.febs.common.utils.MallUtils;
import cc.mrbird.febs.mall.dto.ScoreSettingDto;
import cc.mrbird.febs.mall.dto.TeamPerkDto;
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.service.*;
@@ -882,11 +884,7 @@
                            /**
                             * 先插入流水记录,然后定时器每小时,循环一次找寻对应的数据执行
                             */
                            String frozenDays = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                                    DataDictionaryEnum.BASIC_PERK_DIRECT_FROZEN.getType(),
                                    DataDictionaryEnum.BASIC_PERK_DIRECT_FROZEN.getCode()
                            ).getValue();
                            String orderNo = MallUtils.getOrderNum("FNFT");
                            String orderNo = MallUtils.getOrderNum("DNFT");
                            mallMoneyFlowService.addMoneyFlow(
                                    directMember.getId(),
                                    basicPerkDirect,
@@ -902,11 +900,90 @@
                            mallMemberAmountMapper.updateFrozenNftById(mallMemberAmountDirect);
                        }
                        /**
                         * 团队奖励
                         *
                         */
                        String level = MemberLevelNewEnum.ZERO_LEVEL.getType();
                        BigDecimal equalsPerkBasic = BigDecimal.ZERO;//平级收益,假设平级,则算平级收益的百分比收益
                        boolean flag = false;
                        String parentId = mallMember.getReferrerId();
                        if (StrUtil.isBlank(parentId)) {
                            flag = true;
                        }
                        while (!flag) {
                            MallMember mallMemberRef = memberMapper.selectInfoByInviteId(parentId);
                            String levelRef = mallMemberRef.getLevel();
                            int compareLevel = MemberLevelNewEnum.ZERO_LEVEL.compareLevel(level, levelRef);
                            DataDictionaryCustom dataDictionaryCustom = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                                    levelRef, levelRef
                            );
                            TeamPerkDto teamPerkDto = JSONObject.parseObject(dataDictionaryCustom.getValue(), TeamPerkDto.class);
                            if(compareLevel == 0){//团队奖励
                                BigDecimal PerkPercent = new BigDecimal(teamPerkDto.getPerkPercent());
                                BigDecimal teamPerk = PerkPercent.multiply(profit).setScale(2,BigDecimal.ROUND_DOWN);
                                /**
                                 * 先插入流水记录,然后定时器循环,找寻对应的数据执行
                                 */
                                String orderNo = MallUtils.getOrderNum("TNFT");
                                if(teamPerk.compareTo(BigDecimal.ZERO) > 0){
                                    insertFlowUpdateFrozenNft(
                                            orderNo,
                                            mallMemberRef.getId(),
                                            teamPerk,
                                            MoneyFlowTypeNewEnum.TEAM_PERK_DIRECT.getValue(),
                                            FlowTypeNewEnum.NFT.getValue(),
                                            MoneyFlowTypeNewEnum.TEAM_PERK_DIRECT.getDescrition(),
                                            AppContants.MEMBER_FLOW_ING);
                                }
                                equalsPerkBasic = teamPerk;
                                level = levelRef;
                            }else if(compareLevel == 2){//平级奖励
                                BigDecimal equalsPerkPercent = new BigDecimal(teamPerkDto.getEqualsPerkPercent());
                                BigDecimal equalsPerk = equalsPerkPercent.multiply(equalsPerkBasic).setScale(2,BigDecimal.ROUND_DOWN);
                                String orderNo = MallUtils.getOrderNum("PJNFT");
                                if(equalsPerk.compareTo(BigDecimal.ZERO) > 0){
                                    insertFlowUpdateFrozenNft(
                                            orderNo,
                                            mallMemberRef.getId(),
                                            equalsPerk,
                                            MoneyFlowTypeNewEnum.TEAM_PERK_EQUALS.getValue(),
                                            FlowTypeNewEnum.NFT.getValue(),
                                            MoneyFlowTypeNewEnum.TEAM_PERK_EQUALS.getDescrition(),
                                            AppContants.MEMBER_FLOW_ING);
                                }
                                equalsPerkBasic = equalsPerk;
                            }
                            parentId = mallMemberRef.getReferrerId();
                            if (StrUtil.isBlank(mallMemberRef.getReferrerId())) {
                                flag = true;
                            }
                        }
                    }
                }
            }
        }
    }
    /**
     * 先插入流水记录,更新冻结NFT,后续定时器循环,找寻对应的数据执行
     */
    public void insertFlowUpdateFrozenNft(String orderNo,Long memberId,BigDecimal perk,Integer type,Integer flowType,String desc,
                                          Integer isReturn){
        mallMoneyFlowService.addMoneyFlow(
                memberId,
                perk,
                type,
                orderNo,
                null,
                flowType,
                desc,
                isReturn);
        MallMemberAmount mallMemberAmountDirect = mallMemberAmountMapper.selectByMemberId(memberId);
        mallMemberAmountDirect.setFrozenNft(mallMemberAmountDirect.getFrozenNft().add(perk));
        mallMemberAmountMapper.updateFrozenNftById(mallMemberAmountDirect);
    }
    @Override
@@ -1077,7 +1154,18 @@
        if(CollUtil.isNotEmpty(mallMoneyFlows)){
            return;
        }
        String frozenDays = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                DataDictionaryEnum.BASIC_PERK_DIRECT_FROZEN.getType(),
                DataDictionaryEnum.BASIC_PERK_DIRECT_FROZEN.getCode()
        ).getValue();
        for(MallMoneyFlow mallMoneyFlow : mallMoneyFlows){
            //创建时间往后增加冻结天数,与当前时间进行比较,如果大于当前时间,则跳出循环。
            Date createdTime = mallMoneyFlow.getCreatedTime();
            DateTime dateTime = DateUtil.offsetDay(createdTime, Integer.parseInt(frozenDays));
            if(DateUtil.compare(dateTime, new Date()) > 0){
                continue;
            }
            mallMoneyFlow.setIsReturn(AppContants.MEMBER_FLOW_DONE);
            mallMoneyFlowMapper.updateById(mallMoneyFlow);
            /**
@@ -1123,6 +1211,140 @@
        }
    }
    @Override
    public void teamMemberPerk() {
        QueryWrapper<MallMoneyFlow> queryMallMoneyFlow = new QueryWrapper<>();
        queryMallMoneyFlow.eq("type",MoneyFlowTypeNewEnum.TEAM_PERK_DIRECT.getValue());
        queryMallMoneyFlow.eq("is_return",AppContants.MEMBER_FLOW_ING);
        queryMallMoneyFlow.eq("flow_type",FlowTypeNewEnum.NFT.getValue());
        List<MallMoneyFlow> mallMoneyFlows = mallMoneyFlowMapper.selectList(queryMallMoneyFlow);
        if(CollUtil.isNotEmpty(mallMoneyFlows)){
            return;
        }
        String frozenDays = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                DataDictionaryEnum.BASIC_PERK_DIRECT_FROZEN.getType(),
                DataDictionaryEnum.BASIC_PERK_DIRECT_FROZEN.getCode()
        ).getValue();
        for(MallMoneyFlow mallMoneyFlow : mallMoneyFlows){
            //创建时间往后增加冻结天数,与当前时间进行比较,如果大于当前时间,则跳出循环。
            Date createdTime = mallMoneyFlow.getCreatedTime();
            DateTime dateTime = DateUtil.offsetDay(createdTime, Integer.parseInt(frozenDays));
            if(DateUtil.compare(dateTime, new Date()) > 0){
                continue;
            }
            mallMoneyFlow.setIsReturn(AppContants.MEMBER_FLOW_DONE);
            mallMoneyFlowMapper.updateById(mallMoneyFlow);
            /**
             * 如果用户是冻结,则直接销毁
             */
            Long memberId = mallMoneyFlow.getMemberId();
            MallMember mallMember = memberMapper.selectById(memberId);
            Integer isFrozen = mallMember.getIsFrozen();
            if(ProductEnum.MEMBER_UNFROZEN.getValue() == isFrozen){
                MallMemberAmount mallMemberAmount = mallMemberAmountMapper.selectByMemberId(memberId);
                mallMemberAmount.setFrozenNft(mallMemberAmount.getFrozenNft().subtract(mallMoneyFlow.getAmount()));
                mallMemberAmountMapper.updateFrozenNftById(mallMemberAmount);
                //插入一条流水记录
                String orderNo = MallUtils.getOrderNum("FNFTW");
                mallMoneyFlowService.addMoneyFlow(
                        memberId,
                        mallMoneyFlow.getAmount().negate(),
                        MoneyFlowTypeNewEnum.BASIC_PERK_DIRECT_WRONG.getValue(),
                        orderNo,
                        null,
                        FlowTypeNewEnum.NFT.getValue(),
                        MoneyFlowTypeNewEnum.BASIC_PERK_DIRECT_WRONG.getDescrition(),
                        AppContants.MEMBER_FLOW_ING);
            }else {
                MallMemberAmount mallMemberAmount = mallMemberAmountMapper.selectByMemberId(memberId);
                mallMemberAmount.setFrozenNft(mallMemberAmount.getFrozenNft().subtract(mallMoneyFlow.getAmount()));
                mallMemberAmount.setTrendsNft(mallMemberAmount.getTrendsNft().add(mallMoneyFlow.getAmount()));
                mallMemberAmountMapper.updateTrendsNftAndFrozenNftById(mallMemberAmount);
                //插入一条流水记录
                String orderNo = MallUtils.getOrderNum("NFT");
                mallMoneyFlowService.addMoneyFlow(
                        memberId,
                        mallMoneyFlow.getAmount().negate(),
                        MoneyFlowTypeNewEnum.TEAM_PERK_DIRECT_DONE.getValue(),
                        orderNo,
                        null,
                        FlowTypeNewEnum.NFT.getValue(),
                        MoneyFlowTypeNewEnum.TEAM_PERK_DIRECT_DONE.getDescrition(),
                        AppContants.MEMBER_FLOW_DONE);
            }
        }
    }
    @Override
    public void equalsMemberPerk() {
        QueryWrapper<MallMoneyFlow> queryMallMoneyFlow = new QueryWrapper<>();
        queryMallMoneyFlow.eq("type",MoneyFlowTypeNewEnum.TEAM_PERK_EQUALS.getValue());
        queryMallMoneyFlow.eq("is_return",AppContants.MEMBER_FLOW_ING);
        queryMallMoneyFlow.eq("flow_type",FlowTypeNewEnum.NFT.getValue());
        List<MallMoneyFlow> mallMoneyFlows = mallMoneyFlowMapper.selectList(queryMallMoneyFlow);
        if(CollUtil.isNotEmpty(mallMoneyFlows)){
            return;
        }
        String frozenDays = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                DataDictionaryEnum.BASIC_PERK_DIRECT_FROZEN.getType(),
                DataDictionaryEnum.BASIC_PERK_DIRECT_FROZEN.getCode()
        ).getValue();
        for(MallMoneyFlow mallMoneyFlow : mallMoneyFlows){
            //创建时间往后增加冻结天数,与当前时间进行比较,如果大于当前时间,则跳出循环。
            Date createdTime = mallMoneyFlow.getCreatedTime();
            DateTime dateTime = DateUtil.offsetDay(createdTime, Integer.parseInt(frozenDays));
            if(DateUtil.compare(dateTime, new Date()) > 0){
                continue;
            }
            mallMoneyFlow.setIsReturn(AppContants.MEMBER_FLOW_DONE);
            mallMoneyFlowMapper.updateById(mallMoneyFlow);
            /**
             * 如果用户是冻结,则直接销毁
             */
            Long memberId = mallMoneyFlow.getMemberId();
            MallMember mallMember = memberMapper.selectById(memberId);
            Integer isFrozen = mallMember.getIsFrozen();
            if(ProductEnum.MEMBER_UNFROZEN.getValue() == isFrozen){
                MallMemberAmount mallMemberAmount = mallMemberAmountMapper.selectByMemberId(memberId);
                mallMemberAmount.setFrozenNft(mallMemberAmount.getFrozenNft().subtract(mallMoneyFlow.getAmount()));
                mallMemberAmountMapper.updateFrozenNftById(mallMemberAmount);
                //插入一条流水记录
                String orderNo = MallUtils.getOrderNum("FNFTW");
                mallMoneyFlowService.addMoneyFlow(
                        memberId,
                        mallMoneyFlow.getAmount().negate(),
                        MoneyFlowTypeNewEnum.BASIC_PERK_DIRECT_WRONG.getValue(),
                        orderNo,
                        null,
                        FlowTypeNewEnum.NFT.getValue(),
                        MoneyFlowTypeNewEnum.BASIC_PERK_DIRECT_WRONG.getDescrition(),
                        AppContants.MEMBER_FLOW_ING);
            }else {
                MallMemberAmount mallMemberAmount = mallMemberAmountMapper.selectByMemberId(memberId);
                mallMemberAmount.setFrozenNft(mallMemberAmount.getFrozenNft().subtract(mallMoneyFlow.getAmount()));
                mallMemberAmount.setTrendsNft(mallMemberAmount.getTrendsNft().add(mallMoneyFlow.getAmount()));
                mallMemberAmountMapper.updateTrendsNftAndFrozenNftById(mallMemberAmount);
                //插入一条流水记录
                String orderNo = MallUtils.getOrderNum("NFT");
                mallMoneyFlowService.addMoneyFlow(
                        memberId,
                        mallMoneyFlow.getAmount().negate(),
                        MoneyFlowTypeNewEnum.TEAM_PERK_EQUALS_DONE.getValue(),
                        orderNo,
                        null,
                        FlowTypeNewEnum.NFT.getValue(),
                        MoneyFlowTypeNewEnum.TEAM_PERK_EQUALS_DONE.getDescrition(),
                        AppContants.MEMBER_FLOW_DONE);
            }
        }
    }
    public void insertSell(Long memberId,BigDecimal nftCnt,BigDecimal nftCntAva,
                           BigDecimal nftFee,BigDecimal fcmFeeCnt){
        String orderNo = MallUtils.getOrderNum("NFT");