From b3b3baf9a3b0147ca38476450ca1823c291abd20 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 21 Jun 2024 23:02:46 +0800
Subject: [PATCH] 后台矩阵列表

---
 src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java | 1158 ++++++++++++++++++++++++++-------------------------------
 1 files changed, 528 insertions(+), 630 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
index 3b48b4b..4b6e919 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
@@ -1,48 +1,34 @@
 package cc.mrbird.febs.dapp.service.impl;
 
-import cc.mrbird.febs.common.contants.AppContants;
 import cc.mrbird.febs.common.utils.LoginUserUtil;
 import cc.mrbird.febs.common.utils.RedisUtils;
-import cc.mrbird.febs.dapp.chain.ChainEnum;
-import cc.mrbird.febs.dapp.chain.ChainService;
-import cc.mrbird.febs.dapp.chain.ContractChainService;
 import cc.mrbird.febs.dapp.dto.SystemDto;
 import cc.mrbird.febs.dapp.entity.*;
-import cc.mrbird.febs.dapp.enumerate.CardPeriod;
+import cc.mrbird.febs.dapp.enumerate.DataDictionaryEnum;
+import cc.mrbird.febs.dapp.enumerate.InviteRule;
+import cc.mrbird.febs.dapp.enumerate.NodeType;
 import cc.mrbird.febs.dapp.mapper.*;
 import cc.mrbird.febs.dapp.service.DappSystemService;
 import cc.mrbird.febs.dapp.service.DappWalletService;
-import cc.mrbird.febs.dapp.utils.OnlineTransferUtil;
-import cc.mrbird.febs.dapp.vo.RedisTransferPoolVo;
-import cc.mrbird.febs.dapp.vo.SlipSettingVo;
-import cc.mrbird.febs.job.SystemTradeJob;
-import cc.mrbird.febs.rabbit.producer.ChainProducer;
 import cc.mrbird.febs.tree.MatrixTree;
 import cc.mrbird.febs.tree.MemberNode;
+import cc.mrbird.febs.tree.TreeConstants;
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.RandomUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Document;
-import org.jsoup.nodes.Element;
-import org.jsoup.select.Elements;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.io.IOException;
 import java.math.BigDecimal;
-import java.math.BigInteger;
 import java.math.RoundingMode;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.*;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author
@@ -54,51 +40,17 @@
 public class DappSystemServiceImpl implements DappSystemService {
 
     private final DappSystemDao dappSystemDao;
-    private final DappReturnRatioDao dappReturnRatioDao;
     private final RedisUtils redisUtils;
     private final DappFundFlowDao dappFundFlowDao;
     private final DappMemberDao dappMemberDao;
-    private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
-    private final DappOnlineTransferDao dappOnlineTransferDao;
-    private final ChainProducer chainProducer;
-    private final DappSymbolDailyPriceMapper dappSymbolDailyPriceMapper;
-    private final DappMemberBoxRecordMapper dappMemberBoxRecordMapper;
-    private final DappWalletCoinDao dappWalletCoinDao;
 
     private final DappAchieveTreeDao dappAchieveTreeDao;
     private final DappAchieveMemberTreeDao dappAchieveMemberTreeDao;
     private final DappWalletService dappWalletService;
+    private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
 
+    private final DbMemberNodeMapper dbMemberNodeMapper;
 
-    @Override
-    public Map<String, Object> findTotalInComeAndList() {
-        List<DappMemberEntity> addresses = dappMemberDao.selectList(null);
-        DappMemberEntity mineAddress = dappMemberDao.selectByAddress(ChainEnum.BSC_TFC.getAddress(), null);
-        BigDecimal coinCnt = dappMemberDao.selectAllBalance("normal");
-
-        Map<String, Object> result = new HashMap<>();
-        result.put("total", mineAddress.getBalance());
-        result.put("addreessCnt", addresses.size());
-        result.put("coinCnt", coinCnt);
-        result.put("sourceTFC", ChainService.getInstance(ChainEnum.BSC_TFC.name()).balanceOf(ChainEnum.BSC_TFC_SOURCE.getAddress()));
-        result.put("sourceUSDT", ChainService.getInstance(ChainEnum.BSC_USDT.name()).balanceOf(ChainEnum.BSC_USDT_SOURCE.getAddress()));
-        result.put("cardCnt", 1000);
-        result.put("nftPrice", AppContants.NFT_ACTIVE_PRICE);
-        return result;
-    }
-
-    @Override
-    public Map<String, Object> globalSetting() {
-        BigDecimal newPrice = (BigDecimal) redisUtils.get(AppContants.REDIS_KEY_ETH_NEW_PRICE);
-        Integer changeFee = (Integer) redisUtils.get(AppContants.REDIS_KEY_CHANGE_FEE);
-
-        List<DappReturnRatioEntity> ratios = dappReturnRatioDao.selectList(null);
-        Map<String, Object> result = new HashMap<>();
-        result.put("newPrice", newPrice);
-        result.put("changeFee", changeFee);
-        result.put("ratio", ratios);
-        return result;
-    }
 
     @Override
     public SystemDto system() {
@@ -111,569 +63,38 @@
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void tradeProfitDistribute(Long id) {
-        DappFundFlowEntity fundflow = dappFundFlowDao.selectById(id);
-        String batchNo = RandomUtil.randomString(16) + id.toString();
-
-        BigDecimal fee = fundflow.getFee();
-        DappMemberEntity member = dappMemberDao.selectById(fundflow.getMemberId());
-
-        List<DappMemberEntity> parents;
-        if (StrUtil.isBlank(member.getRefererId()) || "0".equals(member.getRefererId())) {
-            parents = new ArrayList<>();
-        } else {
-            List<String> inviteIds = StrUtil.split(member.getRefererId(), ',');
-            parents = dappMemberDao.selectParentsList(inviteIds, 6);
-            ;
-        }
-
-        DataDictionaryCustom miniHoldCoin = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.DIC_TYPE_SYSTEM_SETTING, AppContants.DIC_VALUE_MINI_HOLD_COIN_LIMIT);
-        DataDictionaryCustom slipPointSetting = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.DIC_TYPE_SLIP_POINT_SETTING, AppContants.DIC_TYPE_SLIP_POINT_SETTING);
-        SlipSettingVo slipSetting = JSONObject.parseObject(slipPointSetting.getValue(), SlipSettingVo.class);
-
-        // 源池
-        ContractChainService instance = ChainService.getInstance(ChainEnum.BSC_TFC_SOURCE.name());
-        BigDecimal destroy = slipSetting.getDestroyPoint().divide(slipSetting.getAllPoint(), 2, RoundingMode.HALF_DOWN).multiply(fee);
-        log.info("销毁数量:{}, 比例:{}", destroy, slipSetting.getDestroyPoint());
-
-        // 销毁
-        OnlineTransferUtil.addTransfer(AppContants.DESTROY_ADDRESS, destroy, fundflow.getType(), 3, ChainEnum.BSC_TFC_SOURCE.name(), AppContants.SYMBOL_COIN, batchNo);
-
-        // 总分发金额
-        BigDecimal distrbAmount = fee.subtract(destroy);
-        // 技术金额
-        BigDecimal techAmount = distrbAmount.multiply(slipSetting.getTechProp().divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP));
-        // 节点金额
-        BigDecimal nodeAmount = distrbAmount.subtract(techAmount);
-        log.info("总分发金额:{}, 技术:{}, 节点:{}", distrbAmount, techAmount, nodeAmount);
-
-        if (CollUtil.isNotEmpty(parents)) {
-            int i = 1;
-            for (DappMemberEntity parent : parents) {
-                BigDecimal balance = instance.balanceOf(parent.getAddress());
-                log.info("地址:{}, 余额:{}", parent.getAddress(), balance);
-
-                // 若地址持币少了指定数量
-                if (balance.compareTo(new BigDecimal(miniHoldCoin.getValue())) < 0) {
-                    continue;
-                }
-
-                DataDictionaryCustom distribDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.DIC_TYPE_DISTRIBUTE_PROP, String.valueOf(i));
-                if (distribDic == null) {
-                    break;
-                }
-
-                BigDecimal total = distrbAmount.multiply(new BigDecimal(distribDic.getValue()).divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP));
-                OnlineTransferUtil.addTransfer(parent.getAddress(), total, fundflow.getType(), 1, ChainEnum.BSC_TFC_SOURCE.name(), AppContants.SYMBOL_COIN, batchNo);
-
-                DappFundFlowEntity distribFlow = new DappFundFlowEntity(parent.getId(), total, 4, 2, BigDecimal.ZERO);
-                dappFundFlowDao.insert(distribFlow);
-
-                nodeAmount = nodeAmount.subtract(total);
-                i++;
-            }
-        }
-
-        // 铸池滑点金额
-        BigDecimal makerAmount = distrbAmount.multiply(slipSetting.getMakeProp().divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP));
-        log.info("铸池滑点金额:{}", makerAmount);
-        if (makerAmount.compareTo(BigDecimal.ZERO) > 0) {
-            List<DappMemberEntity> makerAddress = dappMemberDao.selectMakerAddress();
-            if (CollUtil.isNotEmpty(makerAddress)) {
-                BigDecimal totalMaker = BigDecimal.ZERO;
-                Map<String, BigDecimal> map = new HashMap<>();
-                Map<String, Long> addressAndId = new HashMap<>();
-                for (DappMemberEntity maker : makerAddress) {
-                    BigDecimal balance = instance.balanceOf(maker.getAddress());
-                    map.put(maker.getAddress(), balance);
-                    addressAndId.put(maker.getAddress(), maker.getId());
-
-                    totalMaker = totalMaker.add(balance);
-                }
-
-                for (Map.Entry<String, BigDecimal> entry : map.entrySet()) {
-                    BigDecimal target = makerAmount.multiply(entry.getValue().divide(totalMaker, 2, RoundingMode.HALF_UP));
-
-                    OnlineTransferUtil.addTransfer(entry.getKey(), target, fundflow.getType(), 1, ChainEnum.BSC_TFC_SOURCE.name(), AppContants.SYMBOL_COIN, batchNo);
-
-                    DappFundFlowEntity distribFlow = new DappFundFlowEntity(addressAndId.get(entry.getKey()), target, 4, 2, BigDecimal.ZERO);
-                    dappFundFlowDao.insert(distribFlow);
-                }
-            }
-        }
-
-
-        // 若节点金额还有剩余,则进入技术金额
-        techAmount = techAmount.add(nodeAmount);
-        OnlineTransferUtil.addTransfer(ChainEnum.BSC_TFC_TECH.getAddress(), techAmount, fundflow.getType(), 3, ChainEnum.BSC_TFC_SOURCE.name(), AppContants.SYMBOL_COIN, batchNo);
-
-        Map<String, String> map = new HashMap<>();
-        map.put("batchNo", batchNo);
-        map.put("type", "batch");
-
-        // 发送转账消息
-        chainProducer.sendOnlineTransfer(JSONObject.toJSONString(map));
-    }
-
-    @Override
-    public void tradeNftProfitDistribute(Long id) {
-        DappFundFlowEntity fundFlow = dappFundFlowDao.selectById(id);
-        String batchNo = RandomUtil.randomString(16) + id.toString();
-
-        ContractChainService instance = ChainService.getInstance(ChainEnum.BSC_TFC.name());
-        BigDecimal preNFTAmount;
-        BigDecimal distribAmount = fundFlow.getFee();
-        if (fundFlow.getType() == 1) {
-            preNFTAmount = distribAmount.divide(new BigDecimal("5000"), 2, RoundingMode.HALF_UP);
-
-        } else if (fundFlow.getType() == 2) {
-            BigDecimal destroyAmount = fundFlow.getFee().multiply(new BigDecimal("2").divide(new BigDecimal("7"), instance.decimals(), RoundingMode.HALF_UP));
-            // 销毁
-            OnlineTransferUtil.addTransfer(AppContants.DESTROY_ADDRESS, destroyAmount, fundFlow.getType(), 3, ChainEnum.BSC_TFC_SOURCE.name(), AppContants.SYMBOL_COIN, batchNo);
-            distribAmount = fundFlow.getFee().subtract(destroyAmount);
-
-            preNFTAmount = distribAmount.divide(new BigDecimal("5000"), 2, RoundingMode.HALF_UP);
-
-        } else {
-            return;
-        }
-
-        List<DappMemberEntity> allMembers = dappMemberDao.selectList(null);
-        if (CollUtil.isEmpty(allMembers)) {
-            return;
-        }
-
-        BigDecimal total = BigDecimal.ZERO;
-        for (DappMemberEntity member : allMembers) {
-            BigDecimal balance = instance.balanceOf(member.getAddress());
-            BigDecimal memberProfit = balance.multiply(preNFTAmount);
-
-            // 返利
-            OnlineTransferUtil.addTransfer(member.getAddress(), memberProfit, fundFlow.getType(), 1, ChainEnum.BSC_TFC_SOURCE.name(), AppContants.SYMBOL_COIN, batchNo);
-
-            DappFundFlowEntity distribFlow = new DappFundFlowEntity(member.getId(), memberProfit, 4, 2, BigDecimal.ZERO);
-            dappFundFlowDao.insert(distribFlow);
-
-            total = total.add(memberProfit);
-        }
-
-        BigDecimal remain = distribAmount.subtract(total);
-        // 剩余的
-        OnlineTransferUtil.addTransfer(ChainEnum.BSC_TFC_TECH.getAddress(), remain, fundFlow.getType(), 3, ChainEnum.BSC_TFC_SOURCE.name(), AppContants.SYMBOL_COIN, batchNo);
-    }
-
-//    public static void main(String[] args) throws IOException {
-//        Document parse = Jsoup.parse(new URL("https://bscscan.com/token/generic-tokenholders2?a=0x03c7d3f141c5f03971604958170e253362e13be6"), 10000000);
-//
-//        Elements tbodys = parse.getElementsByTag("tbody");
-//
-//        Element tbody = tbodys.get(0);
-//
-//        Elements elements = tbody.getElementsMatchingOwnText("^0x.*$");
-//
-//        String text = elements.get(0).text();
-//        System.out.println(1111);
-//    }
-
-    @Override
-    public void mining() {
-        ContractChainService contract = ChainService.getInstance(ChainEnum.BSC_TFC.name());
-        // 发行量
-        BigInteger totalSupply = contract.totalSupply();
-
-        if (!systemHasStart()) {
-            return;
-        }
-
-        BigDecimal totalUnHold = contract.balanceOf(AppContants.DESTROY_ADDRESS);
-        List<DappMemberEntity> admin = dappMemberDao.selectMemberByAccountType("admin");
-        for (DappMemberEntity member : admin) {
-            totalUnHold = totalUnHold.add(contract.balanceOf(member.getAddress()));
-        }
-
-        Object transferPoolObj = redisUtils.get(AppContants.REDIS_KEY_MINE_TRANSFER_POOL_TRADE_CNT);
-
-        // 全网持币量
-        BigDecimal allInternet = new BigDecimal(totalSupply).subtract(totalUnHold);
-        // 中转池交易量
-        BigDecimal transferPoll = (BigDecimal) transferPoolObj;
-
-        // 判断今日价格比前一日价格是否跌了,若是,则今天挖矿减半
-        BigDecimal downReduce = BigDecimal.ONE;
-        if (symbolPriceUpOrDown()) {
-            downReduce = new BigDecimal("0.5");
-        }
-
-        BigDecimal totalMineCnt = transferPoll.multiply(new BigDecimal("0.2")).multiply(downReduce);
-
-        List<DappMemberEntity> allMembers = dappMemberDao.selectList(null);
-        if (CollUtil.isEmpty(allMembers)) {
-            return;
-        }
-        DataDictionaryCustom miniHoldCoin = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.DIC_TYPE_SYSTEM_SETTING, AppContants.DIC_VALUE_MINI_HOLD_COIN_LIMIT);
-
-        String batchNo = RandomUtil.randomString(32);
-        ContractChainService instance = ChainService.getInstance(ChainEnum.BSC_TFC.name());
-        for (DappMemberEntity member : allMembers) {
-            if ("admin".equals(member.getAccountType())) {
-                continue;
-            }
-
-            BigDecimal balance = instance.balanceOf(member.getAddress());
-            if (balance.compareTo(new BigDecimal(miniHoldCoin.getValue())) < 1) {
-                continue;
-            }
-
-            // 挖矿数量
-            BigDecimal mine = totalMineCnt.multiply(balance.divide(allInternet, instance.decimals(), RoundingMode.HALF_UP));
-            if (mine.compareTo(BigDecimal.ZERO) < 1) {
-                continue;
-            }
-
-            DappFundFlowEntity fundFlow = new DappFundFlowEntity(member.getId(), mine, 3, 2, BigDecimal.ZERO);
-            dappFundFlowDao.insert(fundFlow);
-            OnlineTransferUtil.addTransfer(member.getAddress(), mine, 3, 1, ChainEnum.BSC_TFC.name(), AppContants.SYMBOL_COIN, batchNo);
-
-            member.setBalance(balance);
-            dappMemberDao.updateById(member);
-        }
-
-        Map<String, String> map = new HashMap<>();
-        map.put("batchNo", batchNo);
-        map.put("type", "batch");
-
-        // 发送转账消息
-        chainProducer.sendOnlineTransfer(JSONObject.toJSONString(map));
-    }
-
-    @Override
-    public void onlineTransfer(String str) {
-        JSONObject jsonObject = JSONObject.parseObject(str);
-        String batchNo = jsonObject.getString("batchNo");
-        List<DappOnlineTransferEntity> transferList = dappOnlineTransferDao.selectByBatchNo(batchNo);
-
-        if (CollUtil.isEmpty(transferList)) {
-            return;
-        }
-
-        for (DappOnlineTransferEntity transfer : transferList) {
-            if (transfer.getHasFinish() == 1) {
-                continue;
-            }
-
-            String txHash = ChainService.getInstance(transfer.getFromType()).transfer(transfer.getAddress(), transfer.getAmount());
-            while (StrUtil.isEmpty(txHash)) {
-                // 休眠2s
-                try {
-                    Thread.sleep(2000);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-                txHash = ChainService.getInstance(transfer.getFromType()).transfer(transfer.getAddress(), transfer.getAmount());
-            }
-
-            transfer.setTxHash(txHash);
-            transfer.setHasFinish(1);
-            transfer.setUpdateTime(new Date());
-            dappOnlineTransferDao.updateById(transfer);
-
-            if ("flow".equals(jsonObject.getString("type"))) {
-                DappFundFlowEntity fundFlow = dappFundFlowDao.selectById(Long.parseLong(batchNo));
-                fundFlow.setToHash(txHash);
-                dappFundFlowDao.updateById(fundFlow);
-            }
-        }
-
-        // 判断系统是否启动,如满足条件则启动系统
-//        String hasStart = redisUtils.getString(AppContants.SYSTEM_START_FLAG);
-//        if (!"start".equals(hasStart)) {
-//            DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.DIC_TYPE_SYSTEM_SETTING, AppContants.DIC_VALUE_SYSTEM_START_TARGET);
-//            BigDecimal target = new BigDecimal(dic.getValue());
-//
-//            // 若源池中的USDT达到或超过8万U,则启动整个系统
-//            BigDecimal balance = ChainService.getInstance(ChainEnum.BSC_USDT_SOURCE.name()).balanceOf(ChainEnum.BSC_USDT_SOURCE.getAddress());
-//            if (target.compareTo(balance) < 1) {
-//                redisUtils.set(AppContants.SYSTEM_START_FLAG, "start");
-//
-//                // 启动系统
-//                startSystem();
-//            }
-//        }
-    }
-
-    @Override
-    public void userBuyReward(Long id) {
-        // 系统未启动不参与
-        if (!systemHasStart()) {
-            return;
-        }
-
-        DappFundFlowEntity fundFlow = dappFundFlowDao.selectById(id);
-
-        DappMemberEntity member = dappMemberDao.selectById(fundFlow.getMemberId());
-        DappMemberEntity referer = dappMemberDao.selectMemberInfoByInviteId(member.getRefererId());
-        if (referer == null || "admin".equals(referer.getAccountType())) {
-            return;
-        }
-
-        if (!hasProfit(referer.getAddress())) {
-            return;
-        }
-
-        DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.DIC_TYPE_SYSTEM_SETTING, AppContants.DIC_VALUE_USER_BUY_REWARD);
-        BigDecimal prop = new BigDecimal(dic.getValue()).divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP);
-        BigDecimal reward = fundFlow.getAmount().multiply(prop);
-
-        BigDecimal balance = ChainService.getInstance(ChainEnum.BSC_TFC_REWARD.name()).balanceOf(ChainEnum.BSC_TFC_REWARD.getAddress());
-        if (balance.compareTo(reward) < 1) {
-            return;
-        }
-
-        DappFundFlowEntity rewardFlow = new DappFundFlowEntity(referer.getId(), reward, 4, 2, BigDecimal.ZERO);
-        dappFundFlowDao.insert(rewardFlow);
-
-        OnlineTransferUtil.addTransfer(referer.getAddress(), reward, 4, 1, ChainEnum.BSC_TFC_REWARD.name(), AppContants.SYMBOL_COIN, rewardFlow.getId().toString());
-
-        Map<String, String> map = new HashMap<>();
-        map.put("batchNo", rewardFlow.getId().toString());
-        map.put("type", "batch");
-        chainProducer.sendOnlineTransfer(JSONObject.toJSONString(map));
-    }
-
-
-    @Override
-    public void startSystem() {
-        log.info("启动系统");
-
-        Thread thread = new Thread(new Runnable() {
-            @Override
-            public void run() {
-                transferPoolSetting();
-                sourcePoolUsdtOutLimitSetting();
-            }
-        });
-
-        thread.start();
-    }
-
-    // 最低容量(百分比)
-    private final BigDecimal volProp = new BigDecimal("2");
-    // 每日增/减百分比
-    private final BigDecimal changeProp = new BigDecimal("1");
-
-    @Override
-    public void transferPoolSetting() {
-        String hasStart = redisUtils.getString(AppContants.SYSTEM_START_FLAG);
-        if (!"start".equals(hasStart)) {
-            log.info("系统未启动");
-            return;
-        }
-
-        // 源池初始化容量
-        DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.DIC_TYPE_SYSTEM_SETTING, AppContants.DIC_VALUE_SYSTEM_SOURCE_POOL_VOL);
-        BigDecimal basicVol = new BigDecimal(dic.getValue());
-
-        Object o = redisUtils.get(AppContants.REDIS_KEY_TRANSFER_POOL_VOL);
-        if (o == null) {
-            RedisTransferPoolVo transferPool = new RedisTransferPoolVo();
-            BigDecimal total = basicVol.multiply(volProp.divide(BigDecimal.valueOf(100), 4, RoundingMode.HALF_UP));
-            transferPool.setTodayVol(total);
-            transferPool.setTodayProp(volProp);
-            transferPool.setFinishCnt(0);
-            transferPool.setUnFinishCnt(0);
-            redisUtils.set(AppContants.REDIS_KEY_TRANSFER_POOL_VOL, transferPool);
-            redisUtils.set(AppContants.REDIS_KEY_TRANSFER_POOL_VOL_REMAIN, total);
-
-            redisUtils.set(AppContants.REDIS_KEY_MINE_TRANSFER_POOL_TRADE_CNT, BigDecimal.ZERO);
-            return;
-        }
-
-        RedisTransferPoolVo transferPool = (RedisTransferPoolVo) o;
-        BigDecimal remain = (BigDecimal) redisUtils.get(AppContants.REDIS_KEY_TRANSFER_POOL_VOL_REMAIN);
-
-        // 设置当日成交量
-        redisUtils.set(AppContants.REDIS_KEY_MINE_TRANSFER_POOL_TRADE_CNT, transferPool.getTodayVol().subtract(remain));
-
-        // 全卖了
-        if (remain.compareTo(BigDecimal.ZERO) == 0) {
-            int finishCnt = transferPool.getFinishCnt() + 1;
-            BigDecimal targetProp = transferPool.getTodayProp();
-            if (finishCnt == 1) {
-                targetProp = transferPool.getTodayVol().add(changeProp);
-                transferPool.setTodayProp(targetProp);
-                transferPool.setFinishCnt(0);
-            } else {
-                transferPool.setFinishCnt(finishCnt);
-            }
-
-            BigDecimal total = basicVol.multiply(targetProp.divide(BigDecimal.valueOf(100), 4, RoundingMode.HALF_UP));
-            transferPool.setTodayVol(total);
-            transferPool.setUnFinishCnt(0);
-            redisUtils.set(AppContants.REDIS_KEY_TRANSFER_POOL_VOL_REMAIN, total);
-
-        } else {
-            int unFinishCnt = transferPool.getUnFinishCnt() + 1;
-            BigDecimal targetProp = transferPool.getTodayProp();
-            if (unFinishCnt >= 1) {
-                targetProp = transferPool.getTodayProp().compareTo(volProp) == 0 ? volProp : transferPool.getTodayProp().subtract(changeProp);
-                transferPool.setTodayProp(targetProp);
-                transferPool.setUnFinishCnt(0);
-            } else {
-                transferPool.setUnFinishCnt(unFinishCnt);
-            }
-            BigDecimal aa = targetProp.divide(BigDecimal.valueOf(100), 4, RoundingMode.HALF_UP);
-            BigDecimal total = basicVol.multiply(aa);
-            transferPool.setTodayVol(total);
-            redisUtils.set(AppContants.REDIS_KEY_TRANSFER_POOL_VOL_REMAIN, total);
-        }
-
-        redisUtils.set(AppContants.REDIS_KEY_TRANSFER_POOL_VOL, transferPool);
-    }
-
-    @Override
-    public void sourcePoolUsdtOutLimitSetting() {
-        String hasStart = redisUtils.getString(AppContants.SYSTEM_START_FLAG);
-        if (!"start".equals(hasStart)) {
-            log.info("系统未启动");
-            return;
-        }
-        BigDecimal sourceBalance = ChainService.getInstance(ChainEnum.BSC_USDT.name()).balanceOf(ChainEnum.BSC_USDT_SOURCE.getAddress());
-
-        BigDecimal total = sourceBalance.multiply(BigDecimal.valueOf(0.1)).setScale(4, RoundingMode.HALF_DOWN);
-        redisUtils.set(AppContants.REDIS_KEY_USDT_OUT_LIMIT, total);
-        redisUtils.set(AppContants.REDIS_KEY_USDT_OUT_LIMIT_REMAIN, total);
-    }
-
-    private boolean symbolPriceUpOrDown() {
-        String dailyPrice = redisUtils.getString(AppContants.REDIS_KEY_SYMBOL_DAILY_PRICE);
-        BigDecimal lastDayPrice = BigDecimal.ZERO;
-        if (StrUtil.isNotBlank(dailyPrice)) {
-            lastDayPrice = new BigDecimal(dailyPrice);
-        }
-
-        ContractChainService tfcInstance = ChainService.getInstance(ChainEnum.BSC_TFC_SOURCE.name());
-        // 源池币种数量
-        BigDecimal tfcBalance = tfcInstance.balanceOf(ChainEnum.BSC_TFC_SOURCE.getAddress());
-
-        // 源池USDT数量
-        BigDecimal usdtBalance = ChainService.getInstance(ChainEnum.BSC_USDT_SOURCE.name()).balanceOf(ChainEnum.BSC_USDT_SOURCE.getAddress());
-
-        BigDecimal todayPrice = tfcBalance.divide(usdtBalance, tfcInstance.decimals(), RoundingMode.HALF_UP);
-
-        DappSymbolDailyPriceEntity dailyPriceEntity = new DappSymbolDailyPriceEntity();
-        dailyPriceEntity.setPrice(todayPrice);
-        this.dappSymbolDailyPriceMapper.insert(dailyPriceEntity);
-
-        redisUtils.set(AppContants.REDIS_KEY_SYMBOL_DAILY_PRICE, todayPrice.toString());
-
-        // 如果价格有跌幅,则挖矿减半
-        return todayPrice.compareTo(lastDayPrice) < 0;
-    }
-
-    @Override
-    public void boxCnt(Long id) {
-        DappFundFlowEntity fundFlow = dappFundFlowDao.selectById(id);
-
-        DappMemberEntity member = dappMemberDao.selectById(fundFlow.getMemberId());
-        DappMemberEntity parent = dappMemberDao.selectMemberInfoByInviteId(member.getRefererId());
-        if (parent == null) {
-            return;
-        }
-
-        DappMemberBoxRecordEntity memberBox = dappMemberBoxRecordMapper.selectByFromMemberId(fundFlow.getMemberId());
-        if (memberBox != null) {
-            return;
-        }
-
-        if (!hasProfit(parent.getAddress())) {
-            return;
-        }
-
-        BigInteger totalSupply = ChainService.getInstance(ChainEnum.BSC_NFT_SDC.name()).totalSupplyNFT();
-        int box = 0;
-        // 需要第一次购买,才在推荐中加1
-        Object parentRecommend = redisUtils.hget(AppContants.IDO_MEMBER_RECOMMEND_CNT, parent.getAddress());
-        if (parentRecommend == null) {
-            redisUtils.hset(AppContants.IDO_MEMBER_RECOMMEND_CNT, parent.getAddress(), 1);
-        } else {
-            int i = (int) parentRecommend;
-
-            // 如果超过10个,则新增一个盲盒,并重置推荐人数
-            if (++i == CardPeriod.ONE.recommendCnt(totalSupply.intValue())) {
-                box = 1;
-                redisUtils.hset(AppContants.IDO_MEMBER_RECOMMEND_CNT, parent.getAddress(), 0);
-            } else {
-                redisUtils.hset(AppContants.IDO_MEMBER_RECOMMEND_CNT, parent.getAddress(), i);
-            }
-        }
-
-        if (box > 0) {
-            DappWalletCoinEntity walletCoin = dappWalletCoinDao.selectByMemberId(parent.getId());
-            walletCoin.setBoxCnt(walletCoin.getBoxCnt() + box);
-            dappWalletCoinDao.updateById(walletCoin);
-
-            DappMemberBoxRecordEntity memberBoxRecordEntity = new DappMemberBoxRecordEntity();
-            memberBoxRecordEntity.setMemberId(parent.getId());
-            memberBoxRecordEntity.setAddress(parent.getAddress());
-            memberBoxRecordEntity.setFromMemberId(member.getId());
-            memberBoxRecordEntity.setFromAddress(member.getAddress());
-            this.dappMemberBoxRecordMapper.insert(memberBoxRecordEntity);
-
-            DappFundFlowEntity boxFundFlow = new DappFundFlowEntity(parent.getId(), new BigDecimal(box), 5, 2, BigDecimal.ZERO);
-            dappFundFlowDao.insert(boxFundFlow);
-        }
-
-    }
-
-    @Override
-    public boolean systemHasStart() {
-        String hasStart = redisUtils.getString(AppContants.SYSTEM_START_FLAG);
-        if (!"start".equals(hasStart)) {
-            log.info("系统未启动");
-            return false;
-        }
-
-        return true;
-    }
-
-    @Override
-    public BigDecimal newestPrice() {
-        if (systemHasStart()) {
-            String dailyPrice = redisUtils.getString(AppContants.REDIS_KEY_SYMBOL_DAILY_PRICE);
-            return StrUtil.isNotBlank(dailyPrice) ? new BigDecimal(dailyPrice) : BigDecimal.ZERO;
-        } else {
-            return new BigDecimal("0.05");
-        }
-    }
-
-    @Override
-    public boolean hasProfit(String address) {
-        BigDecimal balance = ChainService.getInstance(ChainEnum.BSC_TFC.name()).balanceOf(address);
-        BigDecimal usdtBalance = balance.multiply(newestPrice());
-
-        DataDictionaryCustom data = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.DIC_TYPE_SYSTEM_SETTING, AppContants.DIC_VALUE_MINI_HOLD_COIN_LIMIT);
-        BigDecimal miniLimit = new BigDecimal(data.getValue());
-        if (usdtBalance.compareTo(miniLimit) < 0) {
-            return false;
-        }
-
-        return true;
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
     public synchronized void achieveTree(Long memberId) {
         DappMemberEntity member = dappMemberDao.selectById(memberId);
+        if(ObjectUtil.isEmpty(member)){
+            return;
+        }
+
+        int batchNo = 0;
+        DappAchieveTreeEntity newestTreeNode = dappAchieveTreeDao.selectNewestTreeNode();
+        if (newestTreeNode != null) {
+            if (newestTreeNode.getValidState() == 2) {
+                batchNo = newestTreeNode.getBatchNo() + 1;
+            } else {
+                batchNo = newestTreeNode.getBatchNo();
+            }
+        }
 
         // 在大树中,插入当前节点
         DappAchieveTreeEntity achieveTree = new DappAchieveTreeEntity();
         achieveTree.setMidNode(memberId);
         achieveTree.setValidState(1);
+        achieveTree.setBatchNo(batchNo);
         dappAchieveTreeDao.insert(achieveTree);
 
         // 在内存树(大树)中插入当前节点,并返回父节点
         MemberNode node = new MemberNode(member.getId(), member.getAddress(), member.getInviteId(), member.getRefererId());
+
         MatrixTree tree = MatrixTree.getInstance();
+        MemberNode exist = tree.getNode(member.getId());
+        if (exist != null) {
+            return;
+        }
+
         MemberNode parentNode = tree.addNode(node);
 
         // 创建该节点的矩阵
@@ -688,10 +109,11 @@
         dappAchieveMemberTreeDao.insert(achieveMemberTree);
 
         // 激活用户状态
-        member.setActiveStatus(1);
-        dappMemberDao.updateById(member);
+//        member.setActiveStatus(1);
+//        dappMemberDao.updateById(member);
+//        dappMemberDao.updateMemberActiveV2(member.getId());
 
-        putIntoProfit(memberId, 2);
+//        putIntoProfit(memberId, 2);
         if (parentNode == null) {
             return;
         }
@@ -732,6 +154,261 @@
         }
     }
 
+    @Override
+    public void achieveTreeV2(Long fundId) {
+        DappFundFlowEntity dappFundFlowEntity = dappFundFlowDao.selectById(fundId);
+        if(ObjectUtil.isEmpty(dappFundFlowEntity)){
+            return;
+        }
+        Integer status = dappFundFlowEntity.getStatus();
+        if(2 != status){
+            return;
+        }
+        Long memberId = dappFundFlowEntity.getMemberId();
+        DappMemberEntity member = dappMemberDao.selectById(memberId);
+        if(ObjectUtil.isEmpty(member)){
+            return;
+        }
+        BigDecimal amount = dappFundFlowEntity.getAmount();
+        //存放买入新团的类型
+        String toHash = dappFundFlowEntity.getToHash();
+        //根据金额判断属于属于购买的哪一个节点
+        NodeType nodeType = NodeType.NODE_1.getNode(Integer.parseInt(toHash));
+        if(ObjectUtil.isEmpty(nodeType)){
+            return;
+        }
+        /**
+         * 获取一条最老的左右节点未满的记录
+         * 然后生成一条新的记录
+         * 如果添加的为左节点,那么没人出局
+         * 如果添加的为右节点,那么进入判断
+         *      1、父节点为左节点,那么没人出局
+         *      2、父节点为右节点,那么进入判断,父节点是否有上级节点
+         *          1、有,则上级节点出局复投,轮数加1,复投逻辑
+         *
+         */
+        //获取一条最老的左右节点未满且生效中的记录
+        DbMemberNode dbMemberNodeOld = dbMemberNodeMapper.selectOneByWorkStateAndLeftNodeNullOrRightNodeNull(DbMemberNode.STATE_ONE,nodeType.getNodeType());
+        if(ObjectUtil.isEmpty(dbMemberNodeOld)){
+            //生成ROOT节点
+            DbMemberNode root = new DbMemberNode();
+            root.setMemberId(memberId);
+            root.setFundId(fundId);
+            root.setAmount(new BigDecimal(nodeType.getNodeAmount()));
+            root.setType(nodeType.getNodeType());
+            root.setCountFund(1);
+            root.setPerkState(1);
+            root.setWorkState(1);
+            dbMemberNodeMapper.insert(root);
+
+            return;
+        }
+
+        //然后生成一条新的记录
+        DbMemberNode dbMemberNode = new DbMemberNode();
+        dbMemberNode.setMemberId(memberId);
+        dbMemberNode.setFundId(fundId);
+        dbMemberNode.setAmount(new BigDecimal(nodeType.getNodeAmount()));
+        dbMemberNode.setType(nodeType.getNodeType());
+        dbMemberNode.setCountFund(1);
+        dbMemberNode.setPerkState(1);
+        dbMemberNode.setLeftRight(ObjectUtil.isEmpty(dbMemberNodeOld.getLeftNode()) ? 1 : 2);
+        dbMemberNode.setParentNode(dbMemberNodeOld.getId());
+        dbMemberNode.setWorkState(1);
+        dbMemberNodeMapper.insert(dbMemberNode);
+
+        //如果添加的为右节点,那么进入判断
+        if(DbMemberNode.STATE_TWO == dbMemberNode.getLeftRight()){
+            //更新父节点的右节点
+            dbMemberNodeOld.setRightNode(dbMemberNode.getId());
+            dbMemberNodeMapper.updateById(dbMemberNodeOld);
+
+            //父节点为右节点,那么进入判断,父节点是否有上级节点
+            int leftRight = ObjectUtil.isEmpty(dbMemberNodeOld.getLeftRight()) ? 1 : dbMemberNodeOld.getLeftRight();
+            if(DbMemberNode.STATE_TWO == leftRight){
+                if(ObjectUtil.isEmpty(dbMemberNodeOld.getParentNode())){
+                    return;
+                }
+                Long parentNode = dbMemberNodeOld.getParentNode();
+                DbMemberNode dbMemberNodeRoot = dbMemberNodeMapper.selectById(parentNode);
+                if(ObjectUtil.isEmpty(dbMemberNodeRoot)){
+                    return;
+                }
+                //每个星团,只复投10轮
+                if(10 < dbMemberNodeRoot.getCountFund()){
+                    return;
+                }
+                //有,则上级节点出局复投,轮数加1,复投逻辑
+                memberNodeNext(dbMemberNodeRoot);
+            }else{//父节点为左节点,那么没人出局
+                return;
+            }
+        }else{
+            //更新父节点的左节点
+            dbMemberNodeOld.setLeftNode(dbMemberNode.getId());
+            dbMemberNodeMapper.updateById(dbMemberNodeOld);
+            //如果添加的为左节点,那么没人出局
+            return;
+        }
+    }
+
+    /**
+     * 有,则上级节点出局复投,轮数加1,复投逻辑
+     * @param dbMemberNodeRoot
+     */
+    public void memberNodeNext(DbMemberNode dbMemberNodeRoot) {
+        log.info("进入复投");
+
+        DataDictionaryCustom inviteNumDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+                DataDictionaryEnum.INVITE_NUM.getType(),
+                DataDictionaryEnum.INVITE_NUM.getCode()
+        );
+
+        int inviteNum = Integer.parseInt(inviteNumDic.getValue());
+
+        Long memberId = dbMemberNodeRoot.getMemberId();
+        DappMemberEntity dappMemberEntity = dappMemberDao.selectById(memberId);
+        //必须要有两个直推才能复投,或者获取收益,否则,直接返回
+        QueryWrapper<DappMemberEntity> inviteQuery = new QueryWrapper<>();
+        inviteQuery.eq("referer_id",dappMemberEntity.getInviteId());
+        List<DappMemberEntity> dappMemberEntities = dappMemberDao.selectList(inviteQuery);
+        if(CollUtil.isEmpty(dappMemberEntities)){
+            return;
+        }
+        if(inviteNum > dappMemberEntities.size()){
+            return;
+        }
+        List<Long> collect = dappMemberEntities.stream().map(DappMemberEntity::getId).collect(Collectors.toList());
+        QueryWrapper<DbMemberNode> inviteNodeQuery = new QueryWrapper<>();
+        inviteNodeQuery.select("member_id");
+        inviteNodeQuery.eq("work_state", DbMemberNode.STATE_ONE);
+        inviteNodeQuery.in("member_id",collect);
+        inviteNodeQuery.groupBy("member_id");
+        List<DbMemberNode> inviteNodes = dbMemberNodeMapper.selectList(inviteNodeQuery);
+        if(CollUtil.isEmpty(inviteNodes)){
+            return;
+        }
+        if(inviteNum > inviteNodes.size()){
+            return;
+        }
+        //任何星级的原来节点都要出局
+        dbMemberNodeRoot.setWorkState(DbMemberNode.STATE_TWO);
+        dbMemberNodeMapper.updateById(dbMemberNodeRoot);
+        //任何星级,10轮,收益本金都返回
+        Integer countFund = dbMemberNodeRoot.getCountFund();
+        //收益
+        BigDecimal perkAmount = dbMemberNodeRoot.getAmount().multiply(new BigDecimal("1.4"));
+        if(10 == countFund){//任何星级,10轮,收益本金都返回
+            BigDecimal add = dbMemberNodeRoot.getAmount().add(perkAmount);
+            perkSevenTeen(memberId,add,countFund);
+
+            return;
+        }else{
+            Integer type = dbMemberNodeRoot.getType();
+            //如果是13星局,则直接复投产生收益
+            if(NodeType.NODE_13.getNodeType() == type){
+                //复投
+                futouSixTeen(memberId,dbMemberNodeRoot.getAmount(),type,countFund+1);
+                //产生收益
+                perkSevenTeen(memberId,perkAmount,countFund);
+                return;
+            }
+            //如果是1到12星团
+            if(type >=NodeType.NODE_1.getNodeType() && type <= NodeType.NODE_12.getNodeType()){
+                //需要复投本轮,
+                //如果是第一轮,当下一个星团没有投入时,收益复投下一个新团
+                //如果是第一轮,下一个新团有投入,则产生收益
+                //复投或者收益的金额
+                if(1 == countFund){//第一轮
+                    //复投本轮,轮数 +1
+                    futouSixTeen(memberId,dbMemberNodeRoot.getAmount(),type,countFund+1);
+                    //收益复投(当前的下一个星团没有已投入),还是收益提出
+                    Integer nextType = type + 1;
+                    QueryWrapper<DbMemberNode> nodeQueryWrapper = new QueryWrapper<>();
+                    nodeQueryWrapper.eq("member_id",memberId);
+                    nodeQueryWrapper.eq("type", nextType);
+                    nodeQueryWrapper.eq("work_state", DbMemberNode.STATE_ONE);
+                    DbMemberNode dbMemberNode = dbMemberNodeMapper.selectOne(nodeQueryWrapper);
+                    if(ObjectUtil.isEmpty(dbMemberNode)){
+                        futouSixTeen(memberId,perkAmount,nextType,1);
+                    }else{
+                        perkSevenTeen(memberId,perkAmount,countFund);
+                    }
+                }else{//2-9轮
+                    //复投本轮,轮数 +1
+                    futouSixTeen(memberId,dbMemberNodeRoot.getAmount(),type,countFund+1);
+                    perkSevenTeen(memberId,perkAmount,countFund);
+                }
+            }
+        }
+    }
+    /**
+     * 产生收益
+     * @param memberId 会员ID
+     * @param amount 收益金额
+     * @param countFund 轮数
+     */
+    public void perkSevenTeen(Long memberId,BigDecimal amount,Integer countFund){
+        //收益流水
+        DappFundFlowEntity fundFlow = new DappFundFlowEntity(
+                memberId,
+                amount,
+                17,
+                2,
+                BigDecimal.ZERO,
+                countFund.toString());
+        dappFundFlowDao.insert(fundFlow);
+        //更新用户的金额
+        dappWalletService.updateWalletCoinWithLock(amount, memberId, 1);
+    }
+
+    /**
+     * 复投本轮
+     * 插入流水,产生记录
+     * @param memberId 会员ID
+     * @param amount 复投金额
+     * @param type 星团类型
+     * @param countFund 轮数
+     */
+    public void futouSixTeen(Long memberId,BigDecimal amount,Integer type,Integer countFund){
+        //复投流水
+        DappFundFlowEntity fundFlow = new DappFundFlowEntity(
+                memberId,
+                amount,
+                16,
+                2,
+                BigDecimal.ZERO,
+                null);
+        dappFundFlowDao.insert(fundFlow);
+        DbMemberNode dbMemberNodeOld = dbMemberNodeMapper.selectOneByWorkStateAndLeftNodeNullOrRightNodeNull(DbMemberNode.STATE_ONE,type);
+
+        //复投
+        DbMemberNode dbMemberNode = new DbMemberNode();
+        dbMemberNode.setMemberId(memberId);
+        dbMemberNode.setFundId(fundFlow.getId());
+        dbMemberNode.setAmount(amount);
+        dbMemberNode.setType(type);
+        dbMemberNode.setCountFund(countFund);
+        dbMemberNode.setPerkState(1);
+        if(ObjectUtil.isNotEmpty(dbMemberNodeOld)){
+            dbMemberNode.setLeftRight(ObjectUtil.isEmpty(dbMemberNodeOld.getLeftNode()) ? 1 : 2);
+            dbMemberNode.setParentNode(dbMemberNodeOld.getId());
+        }
+        dbMemberNode.setWorkState(1);
+        dbMemberNodeMapper.insert(dbMemberNode);
+
+        if(ObjectUtil.isNotEmpty(dbMemberNodeOld)){
+            if(dbMemberNode.getLeftRight() == 1){
+                dbMemberNodeOld.setLeftNode(dbMemberNode.getId());
+            }else{
+                dbMemberNodeOld.setRightNode(dbMemberNode.getId());
+            }
+            dbMemberNodeMapper.updateById(dbMemberNodeOld);
+        }
+    }
+
+
+
     // 完成矩阵树,并重置矩阵且重入
     public void finishMatrixTree(Long memberId) {
         List<DappAchieveMemberTreeEntity> matrixTree = dappAchieveMemberTreeDao.selectMatrixTreeByTopNode(memberId, 1);
@@ -753,12 +430,9 @@
         DappMemberEntity member = dappMemberDao.selectById(memberId);
         DappMemberEntity parent = dappMemberDao.selectMemberInfoByInviteId(member.getRefererId());
 
-        member.setOutCnt(member.getOutCnt() + 1);
-        dappMemberDao.updateById(member);
-
         if (parent != null) {
-            BigDecimal directProfit = new BigDecimal("100").multiply(new BigDecimal("0.15"));
-            dappWalletService.updateWalletCoinWithLock(directProfit, parent.getId());
+            BigDecimal directProfit = TreeConstants.PUT_IN_AMOUNT.multiply(new BigDecimal("0.1"));
+            dappWalletService.updateWalletCoinWithLock(directProfit, parent.getId(), 1);
 
             DappFundFlowEntity fundFlow = new DappFundFlowEntity(parent.getId(), directProfit, 3, 2, null, null);
             dappFundFlowDao.insert(fundFlow);
@@ -766,25 +440,249 @@
 
         // 如果是复投的,则需奖励
         if (isReIn == 1) {
-            dappWalletService.updateWalletCoinWithLock(new BigDecimal(190), member.getId());
+            List<DappMemberEntity> directCnt = dappMemberDao.selectChildMemberDirectOrNot(member.getInviteId(), 1, 1);
 
-            DappFundFlowEntity matrixProfitFlow = new DappFundFlowEntity(memberId, new BigDecimal("190"), 2, 2, null, null);
-            dappFundFlowDao.insert(matrixProfitFlow);
+            /**
+             * 复投后,推一个拿一轮,推两个拿两轮,推三个后终身有效。
+             * 200u单。
+             * 无直推则收益200U
+             * 一人加一轮400u,二人二轮
+             * 三人永久。
+             */
+            if (directCnt.size() < 3 && member.getOutCnt() != 0 && member.getOutCnt() - 1 == directCnt.size()) {
+                return;
+            } else {
+                BigDecimal amount = null;
+                if (directCnt.size() < 1) {
+                    amount = TreeConstants.PUT_IN_AMOUNT;
+                } else {
+                    amount = TreeConstants.FULL_PROFIT_AMOUNT;
+                }
 
-            DappFundFlowEntity rePutInFlow = new DappFundFlowEntity(memberId, new BigDecimal("100").negate(), 1, 2, null, null);
+                member.setOutCnt(member.getOutCnt() + 1);
+                dappMemberDao.updateById(member);
+
+                dappWalletService.updateWalletCoinWithLock(amount, member.getId(), 1);
+
+                DappFundFlowEntity matrixProfitFlow = new DappFundFlowEntity(memberId, amount, 2, 2, null, null);
+                dappFundFlowDao.insert(matrixProfitFlow);
+            }
+
+            DappFundFlowEntity rePutInFlow = new DappFundFlowEntity(memberId, TreeConstants.PUT_IN_AMOUNT.negate(), 1, 2, null, null);
             dappFundFlowDao.insert(rePutInFlow);
-
-            DappFundFlowEntity safePoolFlow = new DappFundFlowEntity(memberId, new BigDecimal("10").negate(), 4, 2, null, null);
-            dappFundFlowDao.insert(safePoolFlow);
-
-            DappMineDataEntity mineData = dappSystemDao.selectMineDataForOne();
-            mineData.setSafePool(mineData.getSafePool().add(BigDecimal.TEN));
-            dappSystemDao.updateMineData(mineData);
         }
     }
 
     @Override
     public void tfcNewPrice(String data) {
-        redisUtils.set(AppContants.REDIS_KEY_TFC_NEW_PRICE, new BigDecimal(data));
+//        redisUtils.set(AppContants.REDIS_KEY_TFC_NEW_PRICE, new BigDecimal(data));
     }
+
+    @Override
+    public void resetMatrix() {
+        DappAchieveTreeEntity node = dappAchieveTreeDao.selectNewestTreeNode();
+        if (node.getValidState() == 2) {
+            return;
+        }
+
+        long days = DateUtil.between(node.getCreateTime(), new Date(), DateUnit.DAY);
+        if (days < 7) {
+            return;
+        }
+        DappMineDataEntity mineDataEntity = dappSystemDao.selectMineDataForOne();
+
+        List<DappAchieveTreeEntity> list = dappAchieveTreeDao.selectLastCountTreeNode(500);
+        if (CollUtil.isNotEmpty(list)) {
+            BigDecimal preAmount = mineDataEntity.getSafePool().divide(new BigDecimal(list.size()), 2, RoundingMode.HALF_UP);
+
+            list.forEach(item -> {
+                dappWalletService.updateWalletCoinWithLock(preAmount, item.getMidNode(), 1);
+                DappFundFlowEntity flow = new DappFundFlowEntity(item.getMidNode(), preAmount, 8, 2, null, null);
+                dappFundFlowDao.insert(flow);
+            });
+        }
+
+        mineDataEntity.setSafePool(BigDecimal.ZERO);
+        dappSystemDao.updateMineData(mineDataEntity);
+
+        dappAchieveTreeDao.updateNodeValidState();
+        dappAchieveMemberTreeDao.emptyTable();
+        dappMemberDao.updateMemberActive();
+    }
+
+    @Override
+    public void feeDistribute(String data) {
+        if (StrUtil.isBlank(data)) {
+            return;
+        }
+
+        Long flowId = Long.parseLong(data);
+        DappFundFlowEntity fundFlow = dappFundFlowDao.selectById(flowId);
+        if (fundFlow == null) {
+            return;
+        }
+
+        DataDictionaryCustom memberFeeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.MEMBER_FEE.getType(), DataDictionaryEnum.MEMBER_FEE.getCode());
+        if (memberFeeDic == null) {
+            log.info("未设置手续费返利比例");
+            return;
+        }
+        List<DappMemberEntity> memberList = dappMemberDao.selectMemberListNeedProfit();
+        if (CollUtil.isEmpty(memberList)) {
+            return;
+        }
+
+        BigDecimal feeReturnRatio = new BigDecimal(memberFeeDic.getValue());
+        int size = memberList.size();
+        BigDecimal totalProfit = fundFlow.getFee().multiply(feeReturnRatio.divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_DOWN));
+        BigDecimal perProfit = totalProfit.divide(BigDecimal.valueOf(size), 8, RoundingMode.HALF_DOWN);
+
+        memberList.forEach(item -> {
+            dappWalletService.updateWalletMineWithLock(perProfit, item.getId(), 1);
+
+            DappFundFlowEntity profitFlow = new DappFundFlowEntity(item.getId(), perProfit, 12, 2, null, null);
+            dappFundFlowDao.insert(profitFlow);
+        });
+    }
+
+    @Override
+    public void invitePerkMsg(Long id) {
+        /**
+         * 推荐规则:
+         * 无直推奖励,推2个3层,3个6层,4个10层。1%见点奖(有效层级内,每个每1%),共10层,共%10。
+         */
+        DappFundFlowEntity dappFundFlowEntity = dappFundFlowDao.selectById(id);
+        if(ObjectUtil.isEmpty(dappFundFlowEntity)){
+            return;
+        }
+        BigDecimal amount = dappFundFlowEntity.getAmount().abs();
+        /**
+         * 往上循环十层,判断每一层是否有见点奖
+         */
+        Long memberId = dappFundFlowEntity.getMemberId();
+        for(int i = 1;i <= 10;i++){
+            DappMemberEntity dappMemberEntity = dappMemberDao.selectById(memberId);
+            String refererId = dappMemberEntity.getRefererId();
+            //上级不存在,则停止循环。
+            QueryWrapper<DappMemberEntity> objectQueryWrapper = new QueryWrapper<>();
+            objectQueryWrapper.eq("invite_id",refererId);
+            DappMemberEntity dappMemberEntityRef = dappMemberDao.selectOne(objectQueryWrapper);
+            if(ObjectUtil.isEmpty(dappMemberEntityRef)){
+                return;
+            }
+
+            memberId = dappMemberEntityRef.getId();
+            //如果为购买星级激活用户,则跳过
+            Integer activeStatus = dappMemberEntityRef.getActiveStatus();
+            if(1 != activeStatus){
+                continue;
+            }
+            //获取上级全部的直推
+            String inviteId = dappMemberEntityRef.getInviteId();
+            QueryWrapper<DappMemberEntity> memberInviteQuery = new QueryWrapper<>();
+            memberInviteQuery.eq("referer_id",inviteId);
+            List<DappMemberEntity> memberInviteList = dappMemberDao.selectList(memberInviteQuery);
+
+            //如果没有直推,则跳过
+            if(CollUtil.isEmpty(memberInviteList)){
+                continue;
+            }
+
+            InviteRule rule = InviteRule.LEVEL_1.getRule(i);
+            if(ObjectUtil.isEmpty(rule)){
+                return;
+            }
+            //如果直推不满足当前规则需要的人数,则跳过
+            if(memberInviteList.size() < rule.getInviteNum()){
+                continue;
+            }
+            BigDecimal perkPercent = new BigDecimal(rule.getPerkPercent()).multiply(new BigDecimal("0.01"));
+            BigDecimal perkAmount = perkPercent.multiply(amount);
+            Long perkMemberId = dappMemberEntityRef.getId();
+            //生成一条流水
+            DappFundFlowEntity rePutInFlow = new DappFundFlowEntity(
+                    perkMemberId,
+                    perkAmount,
+                    15,
+                    2,
+                    null,
+                    null);
+            dappFundFlowDao.insert(rePutInFlow);
+            //更新用户的金额
+            dappWalletService.updateWalletCoinWithLock(perkAmount, perkMemberId, 1);
+        }
+    }
+
+    @Override
+    public void nodePerkMsg(Long id) {
+        DappFundFlowEntity dappFundFlowEntity = dappFundFlowDao.selectById(id);
+        if(ObjectUtil.isEmpty(dappFundFlowEntity)){
+            return;
+        }
+        BigDecimal amount = dappFundFlowEntity.getAmount().abs();
+        log.info("买入贡献值-平分总金额-{}",amount);
+        /**
+         * 获取节点平分百分比 perkPercent
+         * 获取平分的份数 perKNum
+         * 获取每一份的金额 perkAmount
+         * 获取节点总数 buyNodeNum
+         * 如果perKNum大于buyNodeNum,则每个人获得(amount * perkPercent)/ perKNum = perkAmount
+         * 如果超出,再超出的人没有奖励
+         */
+        DataDictionaryCustom perkPercentDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+                DataDictionaryEnum.PERK_PERCENT.getType(),
+                DataDictionaryEnum.PERK_PERCENT.getCode()
+        );
+        BigDecimal perkPercent = new BigDecimal(ObjectUtil.isEmpty(perkPercentDic) ? "10" : perkPercentDic.getValue()).multiply(new BigDecimal("0.01"));
+
+        DataDictionaryCustom perKNumDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+                DataDictionaryEnum.PERK_NUM.getType(),
+                DataDictionaryEnum.PERK_NUM.getCode()
+        );
+        BigDecimal perKNum = new BigDecimal(ObjectUtil.isEmpty(perKNumDic) ? "200" : perKNumDic.getValue());
+
+        BigDecimal perkAmount = amount.multiply(perkPercent).divide(perKNum, 8, BigDecimal.ROUND_DOWN);
+        if(BigDecimal.ZERO.compareTo(perkAmount) >= 0){
+            return;
+        }
+
+        QueryWrapper<DappMemberEntity> objectQueryWrapper = new QueryWrapper<>();
+        objectQueryWrapper.ge("buy_node",0);
+        List<DappMemberEntity> dappMemberEntities = dappMemberDao.selectList(objectQueryWrapper);
+        if(CollUtil.isEmpty(dappMemberEntities)){
+            return;
+        }
+
+        //奖励总份数
+        BigDecimal totalPerkNum = BigDecimal.ZERO;
+        for(DappMemberEntity dappMemberEntity : dappMemberEntities){
+            //如果账号未激活,则无法领取收益
+            if(1 != dappMemberEntity.getActiveStatus()){
+                continue;
+            }
+            BigDecimal buyNode = new BigDecimal(dappMemberEntity.getBuyNode());
+            totalPerkNum = totalPerkNum.add(buyNode);
+            if(perKNum.compareTo(totalPerkNum) < 0){
+                return;
+            }
+            //奖励金额
+            BigDecimal memberPerk = perkAmount.multiply(buyNode);
+            if(BigDecimal.ZERO.compareTo(memberPerk) >= 0){
+                continue;
+            }
+            dappWalletService.updateWalletCoinWithLock(memberPerk, dappMemberEntity.getId(), 1);
+
+            DappFundFlowEntity fundFlow = new DappFundFlowEntity(
+                    dappMemberEntity.getId(),
+                    memberPerk,
+                    14,
+                    2,
+                    BigDecimal.ZERO,
+                    null);
+            dappFundFlowDao.insert(fundFlow);
+        }
+
+        log.info("买入贡献值-总人数{},-每人金额{}",dappMemberEntities.size(),perkAmount);
+    }
+
 }

--
Gitblit v1.9.1