后台修改

xiaoyong931011

2023-08-28 d03394c01ca1ae7f3431755c628e1bd2106dc287

 src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java

@@ -33,6 +33,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.jline.utils.Log;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.web3j.utils.Convert;
@@ -2469,7 +2470,7 @@
         * 新增一条业绩
         */
        MallAchieveRecord mallAchieveRecord = new MallAchieveRecord(
                memberId,amount,amount,DateUtil.date(),orderId,1,mallOrderInfo.getPayTime()
                memberId,donateScore,donateScore,amount,amount,DateUtil.date(),orderId,1,mallOrderInfo.getPayTime()
        );
        mallAchieveRecordMapper.insert(mallAchieveRecord);

@@ -2516,6 +2517,22 @@
            BigDecimal divide = avaPackagePoor.divide(packageTotalScore, 8, BigDecimal.ROUND_DOWN);
            packageScorePriceDic.setValue(divide.toString());
            dataDictionaryCustomMapper.updateById(packageScorePriceDic);

            DappFundFlowEntity packageFlow = new DappFundFlowEntity(
                    AccountFlowEnum.SYSTEM_PACKAGE.getCode(),
                    1L,
                    addPoor,
                    FundFlowEnum.SYSTEM_ORDER_PACKAGE.getCode(),
                    2,
                    BigDecimal.ZERO,
                    null,
                    orderId);
            dappFundFlowDao.insert(packageFlow);

            DappAKlineEntity dappAKlineEntity = new DappAKlineEntity();
            dappAKlineEntity.setOpenPrice(divide);
            dappAKlineEntity.setType(1);
            dappAKlineMapper.insert(dappAKlineEntity);
        }

    }
@@ -2613,7 +2630,8 @@
            }
            Long perkMemberId = dappMemberEntity.getId();
            //获取当前用户所有进行中的业绩释放
            List<MallAchieveRecord> mallAchieveRecords = mallAchieveRecordMapper.selectListByMemberId(perkMemberId);
//            List<MallAchieveRecord> mallAchieveRecords = mallAchieveRecordMapper.selectListByMemberId(perkMemberId);
            List<MallAchieveRecord> mallAchieveRecords = mallAchieveRecordMapper.selectListByMemberIdAndScore(perkMemberId);

            if(CollUtil.isEmpty(mallAchieveRecords)){
                continue;
@@ -2819,7 +2837,9 @@
                 * 获取用户前一天的所有返利记录
                 */
                List<DappFundFlowEntity> dappFundFlowEntities = dappFundFlowDao.selectListByMemberIdAndTypeAndDate(directMemberId,
                        FundFlowEnum.STATIC_RELEASE.getCode(),DateUtil.offsetHour(DateUtil.date(),-12));
                        FundFlowEnum.STATIC_RELEASE.getCode(),DateUtil.date());
//                List<DappFundFlowEntity> dappFundFlowEntities = dappFundFlowDao.selectListByMemberIdAndTypeAndDate(directMemberId,
//                        FundFlowEnum.STATIC_RELEASE.getCode(),DateUtil.offsetHour(DateUtil.date(),-12));
                if(CollUtil.isEmpty(dappFundFlowEntities)){
                    continue;
                }
@@ -2877,37 +2897,37 @@

        List<DappMemberEntity> dappMemberEntities = dappMemberDao.selectMemberByAccountType(MemberLevelEnum.V1.getType());
        shareStaticPerk(dappMemberEntities,FundFlowEnum.SHARE_PERK_V1.getCode());
        teamStaticPerkMemberLevel(dappMemberEntities,teamPerkEquals,staticRelease,FundFlowEnum.TEAM_PERK_V1.getCode());
        teamStaticPerkMemberLevel(dappMemberEntities,teamPerkEquals,staticRelease,FundFlowEnum.TEAM_PERK_V1.getCode(),MemberLevelEnum.V1.getType());
        isAllPerkMemberLevel(dappMemberEntities,MemberLevelEnum.V1.getType(),FundFlowEnum.ALL_PERK_V1.getCode());

        List<DappMemberEntity> v2DappMemberEntities = dappMemberDao.selectMemberByAccountType(MemberLevelEnum.V2.getType());
        shareStaticPerk(v2DappMemberEntities,FundFlowEnum.SHARE_PERK_V2.getCode());
        teamStaticPerkMemberLevel(v2DappMemberEntities,teamPerkEquals,staticRelease,FundFlowEnum.TEAM_PERK_V2.getCode());
        teamStaticPerkMemberLevel(v2DappMemberEntities,teamPerkEquals,staticRelease,FundFlowEnum.TEAM_PERK_V2.getCode(),MemberLevelEnum.V2.getType());
        isAllPerkMemberLevel(v2DappMemberEntities,MemberLevelEnum.V2.getType(),FundFlowEnum.ALL_PERK_V2.getCode());

        List<DappMemberEntity> v3DappMemberEntities = dappMemberDao.selectMemberByAccountType(MemberLevelEnum.V3.getType());
        shareStaticPerk(v3DappMemberEntities,FundFlowEnum.SHARE_PERK_V3.getCode());
        teamStaticPerkMemberLevel(v3DappMemberEntities,teamPerkEquals,staticRelease,FundFlowEnum.TEAM_PERK_V3.getCode());
        teamStaticPerkMemberLevel(v3DappMemberEntities,teamPerkEquals,staticRelease,FundFlowEnum.TEAM_PERK_V3.getCode(),MemberLevelEnum.V3.getType());
        isAllPerkMemberLevel(v3DappMemberEntities,MemberLevelEnum.V3.getType(),FundFlowEnum.ALL_PERK_V3.getCode());

        List<DappMemberEntity> v4DappMemberEntities = dappMemberDao.selectMemberByAccountType(MemberLevelEnum.V4.getType());
        shareStaticPerk(v4DappMemberEntities,FundFlowEnum.SHARE_PERK_V4.getCode());
        teamStaticPerkMemberLevel(v4DappMemberEntities,teamPerkEquals,staticRelease,FundFlowEnum.TEAM_PERK_V4.getCode());
        teamStaticPerkMemberLevel(v4DappMemberEntities,teamPerkEquals,staticRelease,FundFlowEnum.TEAM_PERK_V4.getCode(),MemberLevelEnum.V4.getType());
        isAllPerkMemberLevel(v4DappMemberEntities,MemberLevelEnum.V4.getType(),FundFlowEnum.ALL_PERK_V4.getCode());

        List<DappMemberEntity> v5DappMemberEntities = dappMemberDao.selectMemberByAccountType(MemberLevelEnum.V5.getType());
        shareStaticPerk(v5DappMemberEntities,FundFlowEnum.SHARE_PERK_V5.getCode());
        teamStaticPerkMemberLevel(v5DappMemberEntities,teamPerkEquals,staticRelease,FundFlowEnum.TEAM_PERK_V5.getCode());
        teamStaticPerkMemberLevel(v5DappMemberEntities,teamPerkEquals,staticRelease,FundFlowEnum.TEAM_PERK_V5.getCode(),MemberLevelEnum.V5.getType());
        isAllPerkMemberLevel(v5DappMemberEntities,MemberLevelEnum.V5.getType(),FundFlowEnum.ALL_PERK_V5.getCode());

        List<DappMemberEntity> v6DappMemberEntities = dappMemberDao.selectMemberByAccountType(MemberLevelEnum.V6.getType());
        shareStaticPerk(v6DappMemberEntities,FundFlowEnum.SHARE_PERK_V6.getCode());
        teamStaticPerkMemberLevel(v6DappMemberEntities,teamPerkEquals,staticRelease,FundFlowEnum.TEAM_PERK_V6.getCode());
        teamStaticPerkMemberLevel(v6DappMemberEntities,teamPerkEquals,staticRelease,FundFlowEnum.TEAM_PERK_V6.getCode(),MemberLevelEnum.V6.getType());
        isAllPerkMemberLevel(v6DappMemberEntities,MemberLevelEnum.V6.getType(),FundFlowEnum.ALL_PERK_V6.getCode());

        List<DappMemberEntity> v7DappMemberEntities = dappMemberDao.selectMemberByAccountType(MemberLevelEnum.V7.getType());
        shareStaticPerk(v7DappMemberEntities,FundFlowEnum.SHARE_PERK_V7.getCode());
        teamStaticPerkMemberLevel(v7DappMemberEntities,teamPerkEquals,staticRelease,FundFlowEnum.TEAM_PERK_V7.getCode());
        teamStaticPerkMemberLevel(v7DappMemberEntities,teamPerkEquals,staticRelease,FundFlowEnum.TEAM_PERK_V7.getCode(),MemberLevelEnum.V7.getType());
        isAllPerkMemberLevel(v7DappMemberEntities,MemberLevelEnum.V7.getType(),FundFlowEnum.ALL_PERK_V7.getCode());

    }
@@ -2925,6 +2945,9 @@
        }
        for(DappFundFlowEntity dappFundFlowEntity : dappFundFlowEntities){
            Long memberId = dappFundFlowEntity.getMemberId();
            if(memberId == 2852L){
                Log.info("1");
            }
            //当日预期总收益
            BigDecimal amount = dappFundFlowEntity.getAmount();
            if(BigDecimal.ZERO.compareTo(amount) >= 0){
@@ -2932,13 +2955,116 @@
            }
            //当日预期总收益
            BigDecimal amountMagic = amount;
            List<MallAchieveRecord> mallAchieveRecords = mallAchieveRecordMapper.selectListByMemberId(memberId);
            if(CollUtil.isEmpty(mallAchieveRecords)){
//            List<MallAchieveRecord> mallAchieveRecords = mallAchieveRecordMapper.selectListByMemberId(memberId);
            List<MallAchieveRecord> mallAchieveRecordsScore = mallAchieveRecordMapper.selectListByMemberIdAndScore(memberId);
            if(CollUtil.isEmpty(mallAchieveRecordsScore)){

                BigDecimal localTotalAchieve = amount;
                /**
                 * 用户减少赠送积分
                 */
                DappMemberEntity dappMemberEntity = dappMemberDao.selectById(memberId);
                DappWalletMineEntity dappWalletMineEntity = dappWalletMineDao.selectByMemberId(memberId);
                BigDecimal totalScore = dappWalletMineEntity.getTotalAmount();
                BigDecimal availableScore = dappWalletMineEntity.getAvailableAmount();
                if(BigDecimal.ZERO.compareTo(totalScore) >= 0){
                    continue;
                }
                if(localTotalAchieve.compareTo(totalScore) >= 0){
                    localTotalAchieve = totalScore;
                    //当实际获取大于用户的赠送积分，将用户更新为未激活
                    dappMemberEntity.setActiveStatus(2);
                    dappMemberDao.updateById(dappMemberEntity);
                }

                DappAccountMoneyChangeEntity reduceScoreAMC = new DappAccountMoneyChangeEntity(
                        memberId,
                        totalScore,
                        amountMagic.negate(),
                        localTotalAchieve.negate(),
                        AccountFlowEnum.SCORE.getCode(),
                        null);
                dappAccountMoneyChangeDao.insert(reduceScoreAMC);

                //插入积分流水
                DappFundFlowEntity scoreFlow = new DappFundFlowEntity(
                        AccountFlowEnum.SCORE.getCode(),
                        memberId,
                        localTotalAchieve.negate(),
                        FundFlowEnum.REDUCE_SCORE_REAL.getCode(),
                        DappFundFlowEntity.WITHDRAW_STATUS_AGREE,
                        BigDecimal.ZERO);
                dappFundFlowDao.insert(scoreFlow);

                BigDecimal totalScoreRelease = totalScore.subtract(localTotalAchieve);
                BigDecimal availableScoreRelease = availableScore.subtract(localTotalAchieve);
                //更新积分账户
                dappWalletMineEntity.setTotalAmount(totalScoreRelease);
                dappWalletMineEntity.setAvailableAmount(availableScoreRelease);
                dappWalletMineDao.updateById(dappWalletMineEntity);


                //用户增加余额
                DappWalletCoinEntity dappWalletCoinEntity = dappWalletCoinDao.selectByMemberId(memberId);
                BigDecimal totalAmount = dappWalletCoinEntity.getTotalAmount();
                BigDecimal availableAmount = dappWalletCoinEntity.getAvailableAmount();

                DappAccountMoneyChangeEntity addAmountAMC = new DappAccountMoneyChangeEntity(
                        memberId,
                        totalAmount,
                        amountMagic,
                        localTotalAchieve,
                        AccountFlowEnum.AMOUNT.getCode(),
                        null);
                dappAccountMoneyChangeDao.insert(addAmountAMC);
                //插入余额流水
                DappFundFlowEntity amountFlow = new DappFundFlowEntity(
                        AccountFlowEnum.AMOUNT.getCode(),
                        memberId,
                        localTotalAchieve,
                        FundFlowEnum.ADD_AMOUNT_REAL.getCode(),
                        DappFundFlowEntity.WITHDRAW_STATUS_AGREE,
                        BigDecimal.ZERO);
                dappFundFlowDao.insert(amountFlow);

                BigDecimal totalAmountRelease = totalAmount.add(localTotalAchieve);
                BigDecimal availableAmountRelease = availableAmount.add(localTotalAchieve);
                //更新余额账户
                dappWalletCoinEntity.setTotalAmount(totalAmountRelease);
                dappWalletCoinEntity.setAvailableAmount(availableAmountRelease);
                dappWalletCoinDao.updateById(dappWalletCoinEntity);

                StringBuffer content = new StringBuffer();
                if(amountMagic.compareTo(localTotalAchieve) > 0){
                    content.append("今日可加速"+amountMagic.setScale(2,BigDecimal.ROUND_DOWN)+"，实际加速"+localTotalAchieve.setScale(2,BigDecimal.ROUND_DOWN)+"" +
                            "烧伤"+amountMagic.subtract(localTotalAchieve).setScale(2,BigDecimal.ROUND_DOWN)+"，原因消费金额1%加速上" +
                            "限，增加消费金额可获得更多收益");
                }else{
                    content.append("今日可加速"+amountMagic.setScale(2,BigDecimal.ROUND_DOWN)+"，实际加速"+localTotalAchieve.setScale(2,BigDecimal.ROUND_DOWN)+"" +
                            "烧伤"+amountMagic.subtract(localTotalAchieve).setScale(2,BigDecimal.ROUND_DOWN));
                }
                DappAccountMoneyChangeEntity record = new DappAccountMoneyChangeEntity(
                        memberId,
                        totalAmount,
                        amountMagic,
                        localTotalAchieve,
                        AccountFlowEnum.AMOUNT_RECORD.getCode(),
                        content.toString());
                dappAccountMoneyChangeDao.insert(record);

                //实时更新用户等级
                chainProducer.sendAutoLevelUpTeamMsg(memberId);

                set.add(dappMemberEntity);
                continue;
            }


            //实际获取总收益
            BigDecimal localTotalAchieve = BigDecimal.ZERO;
            BigDecimal totalAchieve = mallAchieveRecords.stream().map(MallAchieveRecord::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
            BigDecimal totalAchieve = mallAchieveRecordsScore.stream().map(MallAchieveRecord::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
            BigDecimal totalAchieveCostAmount = mallAchieveRecordsScore.stream().map(MallAchieveRecord::getCostAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
            BigDecimal totalScoreAva = mallAchieveRecordsScore.stream().map(MallAchieveRecord::getScore).reduce(BigDecimal.ZERO, BigDecimal::add);

            //用户每日获取的最大值
            DataDictionaryCustom maxReleaseDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
@@ -2947,19 +3073,23 @@
            );
            BigDecimal maxRelease = new BigDecimal(ObjectUtil.isEmpty(maxReleaseDic) ? "1" : maxReleaseDic.getValue());
            //用户每日获取的最大值
            BigDecimal maxReleaseMember = totalAchieve.multiply(maxRelease).setScale(2, BigDecimal.ROUND_DOWN);
            BigDecimal maxReleaseMember = totalAchieveCostAmount.multiply(maxRelease).setScale(2, BigDecimal.ROUND_DOWN);
            if(amount.compareTo(maxReleaseMember) > 0){
                amount = maxReleaseMember;
            }
            //当日获取总收益大于总业绩
            if(amount.compareTo(totalAchieve) >= 0){
                for(MallAchieveRecord memberAchieve : mallAchieveRecords){
//            if(amount.compareTo(totalAchieve) >= 0){
            if(amount.compareTo(totalScoreAva) >= 0){
                for(MallAchieveRecord memberAchieve : mallAchieveRecordsScore){
                    memberAchieve.setIsNormal(2);
                    memberAchieve.setAmount(BigDecimal.ZERO);
                    memberAchieve.setScore(BigDecimal.ZERO);
                    mallAchieveRecordMapper.updateById(memberAchieve);
                }
                localTotalAchieve = totalAchieve;
                amount = amount.subtract(totalAchieve);
//                localTotalAchieve = totalAchieve;
//                amount = amount.subtract(totalAchieve);
                localTotalAchieve = totalScoreAva;
                amount = amount.subtract(totalScoreAva);
            }else{
                /**
                 *
@@ -2968,12 +3098,18 @@
                 * amount 0 0
                 *
                 */
                for(MallAchieveRecord memberAchieve : mallAchieveRecords){
                for(MallAchieveRecord memberAchieve : mallAchieveRecordsScore){
                    BigDecimal achieveAmount = memberAchieve.getAmount();
                    if(BigDecimal.ZERO.compareTo(amount) >= 0){
                    BigDecimal achieveScoreAva = memberAchieve.getScore();
                    if(BigDecimal.ZERO.compareTo(achieveScoreAva) >= 0){
                        break;
                    }else if(amount.compareTo(achieveAmount) < 0){
                        memberAchieve.setAmount(achieveAmount.subtract(amount).setScale(2,BigDecimal.ROUND_DOWN));
                    }else if(amount.compareTo(achieveScoreAva) < 0){
                        if(BigDecimal.ZERO.compareTo(achieveAmount.subtract(amount)) >= 0){
                            memberAchieve.setAmount(BigDecimal.ZERO);
                        }else{
                            memberAchieve.setAmount(achieveAmount.subtract(amount).setScale(2,BigDecimal.ROUND_DOWN));
                        }
                        memberAchieve.setScore(achieveScoreAva.subtract(amount).setScale(2,BigDecimal.ROUND_DOWN));
                        mallAchieveRecordMapper.updateById(memberAchieve);
                        localTotalAchieve = localTotalAchieve.add(amount);
                        amount = BigDecimal.ZERO;
@@ -2981,9 +3117,10 @@
                    }else{
                        memberAchieve.setIsNormal(2);
                        memberAchieve.setAmount(BigDecimal.ZERO);
                        memberAchieve.setScore(BigDecimal.ZERO);
                        mallAchieveRecordMapper.updateById(memberAchieve);
                        localTotalAchieve = localTotalAchieve.add(achieveAmount);
                        amount = amount.subtract(achieveAmount);
                        localTotalAchieve = localTotalAchieve.add(achieveScoreAva);
                        amount = amount.subtract(achieveScoreAva);
                    }
                }
            }
@@ -3060,15 +3197,22 @@
            dappWalletCoinEntity.setAvailableAmount(availableAmountRelease);
            dappWalletCoinDao.updateById(dappWalletCoinEntity);

            StringBuffer content = new StringBuffer();
            if(amountMagic.compareTo(localTotalAchieve) > 0){
                content.append("今日可加速"+amountMagic.setScale(2,BigDecimal.ROUND_DOWN)+"，实际加速"+localTotalAchieve.setScale(2,BigDecimal.ROUND_DOWN)+"" +
                        "烧伤"+amountMagic.subtract(localTotalAchieve).setScale(2,BigDecimal.ROUND_DOWN)+"，原因消费金额1%加速上" +
                        "限，增加消费金额可获得更多收益");
            }else{
                content.append("今日可加速"+amountMagic.setScale(2,BigDecimal.ROUND_DOWN)+"，实际加速"+localTotalAchieve.setScale(2,BigDecimal.ROUND_DOWN)+"" +
                        "烧伤"+amountMagic.subtract(localTotalAchieve).setScale(2,BigDecimal.ROUND_DOWN));
            }
            DappAccountMoneyChangeEntity record = new DappAccountMoneyChangeEntity(
                    memberId,
                    totalAmount,
                    amountMagic,
                    localTotalAchieve,
                    AccountFlowEnum.AMOUNT_RECORD.getCode(),
                    "今日可加速"+amountMagic.setScale(2,BigDecimal.ROUND_DOWN)+"，实际加速"+localTotalAchieve.setScale(2,BigDecimal.ROUND_DOWN)+"" +
                            "烧伤"+amountMagic.subtract(localTotalAchieve).setScale(2,BigDecimal.ROUND_DOWN)+"，原因消费金额1%加速上" +
                            "限，增加消费金额可获得更多收益");
                    content.toString());
            dappAccountMoneyChangeDao.insert(record);

            //实时更新用户等级
@@ -3161,6 +3305,21 @@
        BigDecimal packageAvaCntScore = packageAvaCnt.add(cnt);
        packageAvaCntDic.setValue(packageAvaCntScore.toString());
        dataDictionaryCustomMapper.updateById(packageAvaCntDic);

        DappFundFlowEntity packageFlow = new DappFundFlowEntity(
                AccountFlowEnum.SYSTEM_PACKAGE.getCode(),
                memberId,
                poorAmount.negate(),
                FundFlowEnum.SYSTEM_SALE_PACKAGE.getCode(),
                DappFundFlowEntity.WITHDRAW_STATUS_AGREE,
                BigDecimal.ZERO);
        dappFundFlowDao.insert(packageFlow);

        DappAKlineEntity dappAKlineEntity = new DappAKlineEntity();
        dappAKlineEntity.setOpenPrice(divide);
        dappAKlineEntity.setType(1);
        dappAKlineMapper.insert(dappAKlineEntity);

    }

    @Override
@@ -3169,12 +3328,15 @@
                DataDictionaryEnum.PACKAGE_TEAM_PERK_PERCENT.getType(),
                DataDictionaryEnum.PACKAGE_TEAM_PERK_PERCENT.getCode()
        );
        BigDecimal packageTeamPerkPercent = new BigDecimal(ObjectUtil.isEmpty(packageTeamPerkPercentDic) ? "0.01" : packageTeamPerkPercentDic.getValue()).setScale(2, BigDecimal.ROUND_DOWN);
        BigDecimal packageTeamPerkPercent = new BigDecimal(ObjectUtil.isEmpty(packageTeamPerkPercentDic) ? "0.01" : packageTeamPerkPercentDic.getValue());

        for(DappMemberEntity dappMemberEntity : dappMemberEntities){
//            List<DappFundFlowEntity> dappFundFlowEntities = dappFundFlowDao.selectListByMemberIdAndTypeAndDate(dappMemberEntity.getId()
//                    , FundFlowEnum.ADD_AMOUNT_REAL.getCode()
//                    , DateUtil.offsetHour(DateUtil.date(), -12));
            List<DappFundFlowEntity> dappFundFlowEntities = dappFundFlowDao.selectListByMemberIdAndTypeAndDate(dappMemberEntity.getId()
                    , FundFlowEnum.ADD_AMOUNT_REAL.getCode()
                    , DateUtil.offsetHour(DateUtil.date(), -12));
                    , DateUtil.date());
            //总收益
            BigDecimal totalPerk = dappFundFlowEntities.stream().map(DappFundFlowEntity::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
            BigDecimal memberPerk = totalPerk.multiply(packageTeamPerkPercent);
@@ -3196,6 +3358,9 @@
            }

            BigDecimal packageTeamPerkCnt = new BigDecimal(packageTeamPerkCntDic.getValue()).setScale(2, BigDecimal.ROUND_DOWN);
            if(BigDecimal.ZERO.compareTo(packageTeamPerkCnt) >= 0){
                return;
            }
            if(packageTeamPerkCnt.compareTo(divide) >= 0){
                BigDecimal subtract = packageTeamPerkCnt.subtract(divide);
                packageTeamPerkCntDic.setValue(subtract.toString());
@@ -3227,14 +3392,22 @@
            return;
        }
        for(DappMemberEntity dappMemberEntity : dappMemberEntities){
            if(dappMemberEntity.getId() == 2852){
                Log.info("1");
            }
            /**
             * 每个人的第一次入单之后的业绩不一样
             */
            Date createTime = dappMemberEntity.getCreateTime();
//            List<MallAchieveRecord> mallAchieveRecords = mallAchieveRecordMapper.selectListByMemberId(dappMemberEntity.getId());
            List<MallAchieveRecord> mallAchieveRecords = mallAchieveRecordMapper.selectListByMemberIdAndScore(dappMemberEntity.getId());
            if(CollUtil.isEmpty(mallAchieveRecords)){
                continue;
            }
            Date payTime = mallAchieveRecords.get(0).getPayTime();
            //下第一单之后的共享区全部业绩
            BigDecimal totalAchieve = mallAchieveRecordMapper.selectAchieveTotalByCreateTime(createTime);
            BigDecimal totalAchieve = mallAchieveRecordMapper.selectAchieveTotalByCreateTime(payTime);
            //个人总业绩
            BigDecimal totalMemberAchieve = mallAchieveRecordMapper.selectAchieveTotalByMemberIdAndCreateTime(dappMemberEntity.getId(), createTime);
            BigDecimal totalMemberAchieve = mallAchieveRecordMapper.selectAchieveTotalByMemberIdAndCreateTime(dappMemberEntity.getId(), payTime);
            if(BigDecimal.ZERO.compareTo(totalAchieve) >= 0 || BigDecimal.ZERO.compareTo(totalMemberAchieve) >= 0){
                continue;
            }
@@ -3306,7 +3479,8 @@
    public void teamStaticPerkMemberLevel(List<DappMemberEntity> dappMemberEntities,
                                          BigDecimal teamPerkEquals,
                                          BigDecimal staticRelease,
                                          int code) {
                                          int code,
                                          String memberAccountType) {
        if(CollUtil.isEmpty(dappMemberEntities)){
            return;
        }
@@ -3322,29 +3496,84 @@
                BigDecimal cashPercent = adminAgentInfo.getTeamPercent();
                // 直推用户
                List<DappMemberEntity> childs = dappMemberDao.selectMemberInfoByRefererId(teamPerkMember.getInviteId());
                List<DappMemberEntity> collect = childs.stream()
                        .filter(dappMemberEntity -> dappMemberEntity.getAccountType() == MemberLevelEnum.V1.getType())
                        .collect(Collectors.toList());
                //极差
                if(CollUtil.isNotEmpty(collect)){
                    //平级
                    cashPercent = teamPerkEquals;
                }
//                List<DappMemberEntity> collect = childs.stream()
//                        .filter(dappMemberEntity -> dappMemberEntity.getAccountType().equals(memberAccountType))
//                        .collect(Collectors.toList());
                //所有直推团队，就是这个会员的所有区域的业绩。
                List<String> childsInviteIds = childs.stream().map(DappMemberEntity::getInviteId).collect(Collectors.toList());
                //总业绩
                BigDecimal teamIncomeMax = BigDecimal.ZERO;
                for(String inviteId : childsInviteIds){
                    BigDecimal totalIncomeMember = dappMemberDao.selectAllAchieveByInviteId(inviteId);
                    teamIncomeMax = teamIncomeMax.add(totalIncomeMember);
                }
                if(BigDecimal.ZERO.compareTo(teamIncomeMax) >= 0){
                    continue;
                }
                //V1加速团队静态收益的15%=每日静态的20000*6‰*15%=18元的额外释放加速
                BigDecimal cashAmount = teamIncomeMax.multiply(cashPercent).multiply(staticRelease).setScale(2, BigDecimal.ROUND_DOWN);
//                List<String> childsInviteIds = childs.stream().map(DappMemberEntity::getInviteId).collect(Collectors.toList());
                if(CollUtil.isNotEmpty(childs)){
                    for(DappMemberEntity dappMemberChild : childs){
                        String childAccountType = dappMemberChild.getAccountType();
                        int compareLevel = MemberLevelEnum.V1.compareLevel(level, childAccountType);
                        //级别比我高，则没有团队加速
                        if(compareLevel < 1){
                            continue;
                        }
                        if(compareLevel == 1){
                            BigDecimal cashPercentChild = BigDecimal.ZERO;
                            if(!MemberLevelEnum.MEMBER.getType().equals(childAccountType)){
                                DataDictionaryCustom teamPerkMemberChildDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                                        "TEAM_LEVEL", childAccountType);
                                TeamLevelPerk adminAgentInfoChild = JSONObject.parseObject(teamPerkMemberChildDic.getValue(), TeamLevelPerk.class);
                                cashPercentChild = adminAgentInfoChild.getTeamPercent();
                            }
                            BigDecimal subtract = cashPercent.subtract(cashPercentChild);
                            BigDecimal totalIncomeMember = dappMemberDao.selectAllAchieveByInviteId(dappMemberChild.getInviteId());
                            //V1加速团队静态收益的15%=每日静态的20000*6‰*15%=18元的额外释放加速
                            BigDecimal cashAmount = totalIncomeMember.multiply(staticRelease).multiply(subtract).setScale(2, BigDecimal.ROUND_DOWN);
                            if(BigDecimal.ZERO.compareTo(cashAmount) >= 0){
                                continue;
                            }
                            BigDecimal bigDecimal = sendPerk(teamPerkMember, cashAmount, teamPerkMember.getId(), code);
                            continue;
                        }
                        if(compareLevel > 1){
                            BigDecimal totalIncomeMember = dappMemberDao.selectAllAchieveByInviteId(dappMemberChild.getInviteId());
                            //V1加速团队静态收益的15%=每日静态的20000*6‰*15%=18元的额外释放加速
                            BigDecimal cashAmount = totalIncomeMember.multiply(staticRelease).multiply(teamPerkEquals).setScale(2, BigDecimal.ROUND_DOWN);
                            if(BigDecimal.ZERO.compareTo(cashAmount) >= 0){
                                continue;
                            }
                            BigDecimal bigDecimal = sendPerk(teamPerkMember, cashAmount, teamPerkMember.getId(), code);
                            continue;

                BigDecimal bigDecimal = sendPerk(teamPerkMember, cashAmount, teamPerkMember.getId(), code);
                        }
                    }
                }
//                //总业绩
//                BigDecimal teamIncomeMax = BigDecimal.ZERO;
//                for(String inviteId : childsInviteIds){
//                    //极差
//                    if(CollUtil.isNotEmpty(collect)){
//                        List<String> collectInviteIds = collect.stream().map(DappMemberEntity::getInviteId).collect(Collectors.toList());
//                        if(collectInviteIds.contains(inviteId)){
//                            BigDecimal totalIncomeMember = dappMemberDao.selectAllAchieveByInviteId(inviteId);
//                            //V1加速团队静态收益的15%=每日静态的20000*6‰*15%=18元的额外释放加速
//                            BigDecimal cashAmount = totalIncomeMember.multiply(teamPerkEquals).multiply(staticRelease).setScale(2, BigDecimal.ROUND_DOWN);
//                            if(BigDecimal.ZERO.compareTo(cashAmount) >= 0){
//                                continue;
//                            }
//                            BigDecimal bigDecimal = sendPerk(teamPerkMember, cashAmount, teamPerkMember.getId(), code);
//                            continue;
//                        }else{
//                            BigDecimal totalIncomeMember = dappMemberDao.selectAllAchieveByInviteId(inviteId);
//                            //V1加速团队静态收益的15%=每日静态的20000*6‰*15%=18元的额外释放加速
//                            BigDecimal cashAmount = totalIncomeMember.multiply(cashPercent).multiply(staticRelease).setScale(2, BigDecimal.ROUND_DOWN);
//                            if(BigDecimal.ZERO.compareTo(cashAmount) >= 0){
//                                continue;
//                            }
//                            BigDecimal bigDecimal = sendPerk(teamPerkMember, cashAmount, teamPerkMember.getId(), code);
//                            continue;
//                        }
//                    }
//                    BigDecimal totalIncomeMember = dappMemberDao.selectAllAchieveByInviteId(inviteId);
//                    //V1加速团队静态收益的15%=每日静态的20000*6‰*15%=18元的额外释放加速
//                    BigDecimal cashAmount = totalIncomeMember.multiply(cashPercent).multiply(staticRelease).setScale(2, BigDecimal.ROUND_DOWN);
//                    if(BigDecimal.ZERO.compareTo(cashAmount) >= 0){
//                        continue;
//                    }
//                    BigDecimal bigDecimal = sendPerk(teamPerkMember, cashAmount, teamPerkMember.getId(), code);
//                }
            }
        }