From 98e8b6427b73efc44dbd9511e8291afea6c188d8 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 24 Aug 2023 11:44:26 +0800
Subject: [PATCH] 后台修改

---
 src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 1428 +++++++++++++++++++++--------------------------------------
 1 files changed, 506 insertions(+), 922 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
index 267094a..4e9db5c 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
@@ -1,49 +1,28 @@
 package cc.mrbird.febs.dapp.service.impl;
 
-import cc.mrbird.febs.common.configure.i18n.MessageSourceUtils;
 import cc.mrbird.febs.common.contants.AppContants;
+import cc.mrbird.febs.common.entity.FebsResponse;
 import cc.mrbird.febs.common.entity.QueryRequest;
 import cc.mrbird.febs.common.exception.FebsException;
-import cc.mrbird.febs.common.utils.FebsUtil;
 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.*;
 import cc.mrbird.febs.dapp.entity.*;
-import cc.mrbird.febs.dapp.enumerate.DataDictionaryEnum;
-import cc.mrbird.febs.dapp.enumerate.FundFlowEnum;
-import cc.mrbird.febs.dapp.enumerate.NodeCodeEnum;
-import cc.mrbird.febs.dapp.enumerate.PoolEnum;
+import cc.mrbird.febs.dapp.enumerate.*;
 import cc.mrbird.febs.dapp.mapper.*;
 import cc.mrbird.febs.dapp.service.DappWalletService;
-import cc.mrbird.febs.dapp.utils.BoxUtil;
-import cc.mrbird.febs.dapp.vo.ActiveNftListVo;
-import cc.mrbird.febs.dapp.vo.DappFundFlowVo;
-import cc.mrbird.febs.dapp.vo.DappMemberNodeVo;
-import cc.mrbird.febs.dapp.vo.WalletInfoVo;
-import cc.mrbird.febs.rabbit.producer.ChainProducer;
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.date.DateField;
-import cn.hutool.core.date.DateUnit;
-import cn.hutool.core.date.DateUtil;
+import cc.mrbird.febs.dapp.vo.*;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import freemarker.template.utility.StringUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.util.*;
 
 /**
@@ -62,58 +41,10 @@
     private final DappAccountMoneyChangeDao dappAccountMoneyChangeDao;
     private final RedisUtils redisUtils;
     private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
-    private final DappNftActivationDao dappNftActivationDao;
     private final MemberCoinWithdrawDao memberCoinWithdrawDao;
 
-    private final ChainProducer chainProducer;
-    private final DappSystemDao dappSystemDao;
-    private final DappSystemProfitDao dappSystemProfitDao;
-
-    private final DappNodeOrderMapper dappNodeOrderMapper;
-    private final DappMemberNodeMapper dappMemberNodeMapper;
     private final DappChargeUsdtMapper dappChargeUsdtMapper;
-    private final DappUsdtPerkEntityMapper dappUsdtPerkEntityMapper;
-
-    @Override
-    public WalletInfoVo walletInfo() {
-        DappMemberEntity member = LoginUserUtil.getAppUser();
-
-        DappMemberEntity memberInfo = dappMemberDao.selectById(member.getId());
-        WalletInfoVo walletInfo = new WalletInfoVo();
-        List<DappMemberEntity> direct = dappMemberDao.selectChildMemberDirectOrNot(member.getInviteId(), 1, 1);
-        DappWalletCoinEntity walletCoin = dappWalletCoinDao.selectByMemberId(member.getId());
-        DappWalletMineEntity walletMine = dappWalletMineDao.selectByMemberId(member.getId());
-
-        DappMineDataEntity mineData = dappSystemDao.selectMineDataForOne();
-        walletInfo.setDirectCnt(direct.size());
-        walletInfo.setInviteId(member.getActiveStatus() == 1 ? member.getInviteId() : "-");
-        walletInfo.setBalance(walletCoin.getAvailableAmount());
-        walletInfo.setHasBuy(memberInfo.getActiveStatus());
-        walletInfo.setOutCnt(memberInfo.getOutCnt());
-        walletInfo.setProfit(dappFundFlowDao.selectProfitAmountByMemberId(member.getId()));
-        walletInfo.setTfcBalance(walletMine.getAvailableAmount());
-        walletInfo.setSafePool(mineData.getSafePool());
-
-        walletInfo.setAccountType(memberInfo.getAccountType());
-        DappSystemProfit dappSystemProfit = dappSystemProfitDao.selectByMemberIdAndState(memberInfo.getId(),DappSystemProfit.STATE_IN);
-        walletInfo.setSystemProfitId(ObjectUtil.isEmpty(dappSystemProfit) ? 0L : dappSystemProfit.getId());
-        BigDecimal directProfit = dappFundFlowDao.selectSumAmountByMemberIdAndTypeAndStatus(memberInfo.getId(),3,2);
-        walletInfo.setDirectProfit(directProfit);
-        BigDecimal levelProfit = dappFundFlowDao.selectSumAmountByMemberIdAndTypeAndStatus(memberInfo.getId(),4,2);
-        walletInfo.setLevelProfit(levelProfit);
-        BigDecimal luckyProfit = dappFundFlowDao.selectSumAmountByMemberIdAndTypeAndStatus(memberInfo.getId(),7,2);
-        walletInfo.setLuckyProfit(luckyProfit);
-        if(DataDictionaryEnum.BIG_BOSS.getCode().equals(memberInfo.getAccountType())){
-            walletInfo.setRunPercent(new BigDecimal(100));
-        }else{
-            walletInfo.setRunPercent(new BigDecimal(90));
-        }
-
-        //获取会员节点信息
-        List<DappMemberNodeVo> dappMemberNodeVos = dappMemberNodeMapper.selectListByMemberId(member.getId());
-        walletInfo.setDappMemberNodeVos(dappMemberNodeVos);
-        return walletInfo;
-    }
+    private final DappAKlineMapper dappAKlineMapper;
 
     @Override
     public List<DappFundFlowEntity> recordInPage(RecordInPageDto recordInPageDto) {
@@ -155,206 +86,6 @@
         return dappAccountMoneyChangeDao.selectInPage(change, page);
     }
 
-    /**
-     * // 第一次{amount: val, fee: 0, txHash: '', type: 1, buyType: 2}
-     *       // 成功{type: 1, txHash: result.transactionHash, id: res.data, flag: 'success', buyType: 2}
-     *       // 失败{type: 1, id: res.data, flag: 'fail', buyType: 2}
-     */
-    @Override
-    public Long transfer(TransferDto transferDto) {
-        DappMemberEntity member = LoginUserUtil.getAppUser();
-
-        String upgrade = redisUtils.getString("APP_UPGRADE");
-        if ("upgrade".equals(upgrade)) {
-            throw new FebsException("功能升级中");
-        }
-
-//        if (transferDto.getType() != 2) {
-//            member = dappMemberDao.selectById(member.getId());
-//            if (member.getActiveStatus() == 1) {
-//                throw new FebsException("Do not repeat purchase");
-//            }
-//        }
-        /**
-         * buyType=1,余额购买
-         */
-        if (transferDto.getBuyType() == 1) {
-            DappWalletCoinEntity walletCoin = dappWalletCoinDao.selectByMemberId(member.getId());
-            if (transferDto.getAmount().compareTo(walletCoin.getAvailableAmount()) > 0) {
-                throw new FebsException("Balance Not Enough");
-            }
-
-            updateWalletCoinWithLock(transferDto.getAmount(), member.getId(), 2);
-
-            DappFundFlowEntity fundFlow = new DappFundFlowEntity(member.getId(), transferDto.getAmount().negate(), 1, 2, transferDto.getFee(), transferDto.getTxHash());
-            dappFundFlowDao.insert(fundFlow);
-
-//            chainProducer.sendAchieveTreeMsg(member.getId());
-        } else {
-            /**
-             * buyType=2,钱包购买
-             */
-            int type = FundFlowEnum.BUY_NODE.getCode();
-            // 1-认购 2-充值tfc
-            if (transferDto.getType() == 2) {
-                type = 6;
-            }
-            /**
-             * 第一次请求,生成一条资金流水ID,并且返回。
-             */
-            if (transferDto.getId() == null) {
-                /**
-                 * 验证节点的价格是否和入参价格一致
-                 */
-                String nodeCode = transferDto.getNodeCode();
-                DappNodeOrderEntity dappNodeOrderEntity = dappNodeOrderMapper.selectNodeOrderByNodeCodeForupdate(nodeCode);
-                BigDecimal price = dappNodeOrderEntity.getPrice();
-                BigDecimal amount = transferDto.getAmount();
-                if(price.compareTo(amount) != 0){
-                    throw new FebsException("刷新后重试");
-//                    throw new FebsException("Refresh and try again");
-                }
-                Integer surplusCnt = dappNodeOrderEntity.getSurplusCnt();
-                if(0 >= surplusCnt){
-                    throw new FebsException("该节点剩余数量为0。");
-                }
-
-
-                /**
-                 * 超级节点只允许购买一次
-                 */
-                if(NodeCodeEnum.SUPER_NODE.getCode().equals(nodeCode)){
-                    DappMemberNodeEntity superNode = dappMemberNodeMapper.selectNodeByMemberIdAndNodeCode(
-                            member.getId(), NodeCodeEnum.SUPER_NODE.getCode());
-                    if(ObjectUtil.isNotEmpty(superNode)){
-                        throw new FebsException("超级节点只能购买一次");
-                    }
-                }
-
-                DappFundFlowEntity fundFlowOld = dappFundFlowDao.selectBymemberIdAndType(member.getId(),type,DappFundFlowEntity.WITHDRAW_STATUS_ING);
-                if(ObjectUtil.isNotEmpty(fundFlowOld)){
-                    //网络问题导致第二次提交前,未成功就关闭了页面
-                    if (fundFlowOld.getStatus() == 1 && StrUtil.isEmpty(fundFlowOld.getFromHash())) {
-                        dappFundFlowDao.deleteById(fundFlowOld.getId());
-                        throw new FebsException("Refresh and try again");
-                    }
-                }
-                DappFundFlowEntity fundFlow = new DappFundFlowEntity(member.getId(), transferDto.getAmount(), type, 1, transferDto.getFee(), transferDto.getTxHash(),transferDto.getNodeCode());
-                dappFundFlowDao.insert(fundFlow);
-                return fundFlow.getId();
-            }
-
-            if ("success".equals(transferDto.getFlag())) {
-                DappFundFlowEntity flow = dappFundFlowDao.selectById(transferDto.getId());
-                if(DappFundFlowEntity.WITHDRAW_STATUS_AGREE == flow.getStatus()){
-                    throw new FebsException("请勿重复提交");
-//                    throw new FebsException("Do not repeat purchase");
-                }
-                /**
-                 * 生成会员节点表记录
-                 */
-                String nodeCode = transferDto.getNodeCode();
-                DappNodeOrderEntity dappNodeOrderEntity = dappNodeOrderMapper.selectNodeOrderByNodeCodeForupdate(nodeCode);
-                DappMemberNodeEntity dappMemberNodeEntityNew = new DappMemberNodeEntity(
-                        member.getId(),
-                        dappNodeOrderEntity.getId(),
-                        dappNodeOrderEntity.getNodeCode(),
-                        transferDto.getAmount()
-                );
-                dappMemberNodeMapper.insert(dappMemberNodeEntityNew);
-
-                Integer surplusCnt = dappNodeOrderEntity.getSurplusCnt();
-                surplusCnt = surplusCnt - 1;
-                dappNodeOrderEntity.setSurplusCnt(surplusCnt);
-                dappNodeOrderMapper.updateById(dappNodeOrderEntity);
-
-                /**
-                 * 流水关联用户购买节点记录
-                 */
-                flow.setSystemProfitId(dappMemberNodeEntityNew.getId());
-                /**
-                 * 链上转账的hash值
-                 */
-                flow.setFromHash(transferDto.getTxHash());
-                flow.setStatus(DappFundFlowEntity.WITHDRAW_STATUS_AGREE);
-                dappFundFlowDao.updateById(flow);
-                /**
-                 * 升级账号类型为对应的节点名称
-                 */
-//                dappMemberDao.updateMemberAccountType(dappNodeOrderEntity.getNodeName(),member.getId());
-                /**
-                 * 更新账号的状态为已激活-即已经购买节点
-                 */
-//                dappMemberDao.updateMemberActiveStatus(1,member.getId());
-                /**
-                 * 直推奖励
-                 */
-                DappMemberEntity dappMemberEntity = dappMemberDao.selectById(member.getId());
-                String refererId = dappMemberEntity.getRefererId();
-                DappMemberEntity refererMember = dappMemberDao.selectMemberInfoByInviteId(refererId);
-                DataDictionaryCustom directProfitDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
-                        DataDictionaryEnum.DIRECT_PROFIT.getType(),
-                        DataDictionaryEnum.DIRECT_PROFIT.getCode());
-                BigDecimal directProfitPercent = new BigDecimal(StrUtil.isEmpty(directProfitDic.getValue()) ? "0.1" : directProfitDic.getValue());
-                BigDecimal amount = transferDto.getAmount();
-                BigDecimal directProfit = amount.multiply(directProfitPercent).setScale(6,BigDecimal.ROUND_DOWN);
-                //生成直推奖励的流水
-                DappFundFlowEntity fundFlow = new DappFundFlowEntity(
-                        refererMember.getId(),
-                        directProfit,
-                        2,
-                        1,
-                        BigDecimal.ZERO,
-                        null,
-                        dappMemberNodeEntityNew.getId());
-                dappFundFlowDao.insert(fundFlow);
-
-                /**
-                 * 发送转币消息
-                 */
-                chainProducer.sendBnbTransferMsg(fundFlow.getId());
-
-
-                BigDecimal subtract = amount.subtract(directProfit);
-
-                //剩余的钱给分走
-                DappFundFlowEntity fundFlowEntityProject = new DappFundFlowEntity(
-                        4L,
-                        subtract,
-                        3,
-                        1,
-                        BigDecimal.ZERO,
-                        null,
-                        dappMemberNodeEntityNew.getId());
-                dappFundFlowDao.insert(fundFlowEntityProject);
-
-                /**
-                 * 发送转币消息
-                 */
-                chainProducer.sendBnbTransferMsg(fundFlowEntityProject.getId());
-            } else {
-                DappFundFlowEntity flow = dappFundFlowDao.selectById(transferDto.getId());
-                if (flow.getStatus() == 1) {
-                    dappFundFlowDao.deleteById(transferDto.getId());
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public BigDecimal calPrice(PriceDto priceDto) {
-//        String priceStr = redisUtils.getString(AppContants.REDIS_KEY_TFC_NEW_PRICE);
-        DataDictionaryCustom symbolPrice = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.SYMBOL_PRICE.getType(), DataDictionaryEnum.SYMBOL_PRICE.getCode());
-        DataDictionaryCustom serviceFeeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.WITHDRAW_SERVICE_FEE.getType(), DataDictionaryEnum.WITHDRAW_SERVICE_FEE.getCode());
-
-        BigDecimal amount = priceDto.getAmount();
-        if (priceDto.getAmount() == null) {
-            amount = BigDecimal.ZERO;
-        }
-        return amount.multiply(new BigDecimal(serviceFeeDic.getValue()).divide(BigDecimal.valueOf(100), 8, RoundingMode.HALF_DOWN)).divide(new BigDecimal(symbolPrice.getValue()), 2, RoundingMode.HALF_UP);
-    }
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void withdraw(WithdrawDto withdrawDto) {
@@ -382,96 +113,58 @@
         if (walletCoin.getAvailableAmount().compareTo(withdrawDto.getAmount()) < 0) {
             throw new FebsException("可提现的数量不足");
         }
-        DataDictionaryCustom aCoinPriceDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
-                PoolEnum.COIN_A_PRICE.getType(),
-                PoolEnum.COIN_A_PRICE.getCode()
+        DataDictionaryCustom withdrawFeeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+                DataDictionaryEnum.WITHDRAW_FEE.getType(),
+                DataDictionaryEnum.WITHDRAW_FEE.getCode()
         );
-        BigDecimal coinAPrice = new BigDecimal(aCoinPriceDic.getValue());
-        //预计提现的USDT数量 = 币的数量 * 当前A币的价格
-        BigDecimal coinUsdtAmount = amount.multiply(coinAPrice);
-        /**
-         * 卖币可享有贡献值,鼓励卖币,例.卖出价值100U获得100贡献值
-         */
-        DappUsdtPerkEntity directDappUsdtPerkEntity = dappUsdtPerkEntityMapper.selectByMemberId(member.getId());
-        if(ObjectUtil.isEmpty(directDappUsdtPerkEntity)){
-            directDappUsdtPerkEntity = new DappUsdtPerkEntity();
-            directDappUsdtPerkEntity.setNftDevote(coinUsdtAmount);
-            directDappUsdtPerkEntity.setMemberId(member.getId());
-            dappUsdtPerkEntityMapper.insert(directDappUsdtPerkEntity);
+        BigDecimal withdrawFee = new BigDecimal(withdrawFeeDic.getValue());
+        //最小提现金额
+        DataDictionaryCustom minWithdrawDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+                DataDictionaryEnum.MIN_WITHDRAW_AMOUNT.getType(),
+                DataDictionaryEnum.MIN_WITHDRAW_AMOUNT.getCode()
+        );
+        BigDecimal minWithdraw = new BigDecimal(minWithdrawDic.getValue()).setScale(2,BigDecimal.ROUND_DOWN);
+        if (minWithdraw.compareTo(withdrawDto.getAmount()) > 0) {
+            throw new FebsException("最小提现金额为"+minWithdraw);
         }
-
-        BigDecimal directNftDevote = directDappUsdtPerkEntity.getNftDevote();
-        directNftDevote = directNftDevote.add(coinUsdtAmount);
-        directDappUsdtPerkEntity.setNftDevote(directNftDevote);
-        dappUsdtPerkEntityMapper.updateById(directDappUsdtPerkEntity);
-
-        DataDictionaryCustom toUsdtPercentFeeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
-                PoolEnum.WALLET_COIN_TO_USDT_PERCENT.getType(),
-                PoolEnum.WALLET_COIN_TO_USDT_PERCENT.getCode()
+        //今日最大提现金额
+        DataDictionaryCustom maxWithdrawDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+                DataDictionaryEnum.MAX_WITHDRAW_AMOUNT.getType(),
+                DataDictionaryEnum.MAX_WITHDRAW_AMOUNT.getCode()
         );
-        BigDecimal feePercent = new BigDecimal(toUsdtPercentFeeDic.getValue());
-        //手续费扣除USDT
-        BigDecimal feeUsdtAmount = coinUsdtAmount.multiply(feePercent).setScale(4,BigDecimal.ROUND_DOWN);
-        //实际提现USDT数量,先扣除1%的手续费后,只到账70%
-
-        DataDictionaryCustom outPercentDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
-                PoolEnum.WALLET_COIN_OUT_PERCENT.getType(),
-                PoolEnum.WALLET_COIN_OUT_PERCENT.getCode()
-        );
-        BigDecimal outPercent = new BigDecimal(outPercentDic.getValue());
-        BigDecimal realUsdtAmount = coinUsdtAmount.subtract(feeUsdtAmount).setScale(4,BigDecimal.ROUND_DOWN);
-        BigDecimal realUsdtAmountFee = realUsdtAmount.multiply(outPercent).setScale(4,BigDecimal.ROUND_DOWN);
-        realUsdtAmount = realUsdtAmount.subtract(realUsdtAmountFee);
-        //减少闪对钱包的币的数量
+        BigDecimal maxWithdraw = new BigDecimal(maxWithdrawDic.getValue()).setScale(2,BigDecimal.ROUND_DOWN);
+        BigDecimal withdrawToday = dappFundFlowDao.selectSumAmountByMemberIdAndType(member.getId(), FundFlowEnum.WITHDRAW_USDT.getCode());
+        withdrawToday = withdrawToday.add(withdrawDto.getAmount());
+        if (maxWithdraw.compareTo(withdrawToday) < 0) {
+            throw new FebsException("今日提现最多可申请"+maxWithdraw);
+        }
+        //手续费
+        BigDecimal feeAmount = amount.multiply(withdrawFee);
+        //减少余额
         this.updateWalletCoinWithLock(amount, member.getId(), 2);
+
+        BigDecimal withdrawAmount = amount.divide(new BigDecimal(7),2,BigDecimal.ROUND_DOWN);
+        BigDecimal withdrawAmountFee = feeAmount.divide(new BigDecimal(7),2,BigDecimal.ROUND_DOWN);
+
         //增加流水
-        DappFundFlowEntity dappFundFlowEntity = new DappFundFlowEntity(member.getId(), amount.negate(), FundFlowEnum.WALLET_COIN_TO_USDT.getCode(), 2, BigDecimal.ZERO);
+        DappFundFlowEntity dappFundFlowEntity = new DappFundFlowEntity(
+                AccountFlowEnum.AMOUNT.getCode(),
+                member.getId(),
+                withdrawAmount.negate(),
+                FundFlowEnum.WITHDRAW_USDT.getCode(),
+                DappFundFlowEntity.WITHDRAW_STATUS_ING,
+                withdrawAmountFee);
         dappFundFlowDao.insert(dappFundFlowEntity);
-        //增加流水
-        DappFundFlowEntity realUsdtAmountFlow = new DappFundFlowEntity(member.getId(), realUsdtAmount.negate(), FundFlowEnum.WALLET_COIN_TO_USDT_W.getCode(), 1, feeUsdtAmount);
-        dappFundFlowDao.insert(realUsdtAmountFlow);
         //增加提现的记录
         MemberCoinWithdrawEntity memberCoinWithdraw = new MemberCoinWithdrawEntity();
         memberCoinWithdraw.setMemberId(member.getId());
         memberCoinWithdraw.setAddress(member.getAddress());
-        memberCoinWithdraw.setAmount(realUsdtAmount);
-        memberCoinWithdraw.setFeeAmount(feeUsdtAmount);
-        memberCoinWithdraw.setStatus(MemberCoinWithdrawEntity.STATUS_YES);
+        memberCoinWithdraw.setAmount(withdrawAmount.subtract(withdrawAmountFee));
+        memberCoinWithdraw.setFeeAmount(withdrawAmountFee);
+        memberCoinWithdraw.setStatus(MemberCoinWithdrawEntity.STATUS_DOING);
         memberCoinWithdraw.setSymbol("USDT");
-        memberCoinWithdraw.setFlowId(realUsdtAmountFlow.getId());
+        memberCoinWithdraw.setFlowId(dappFundFlowEntity.getId());
         memberCoinWithdrawDao.insert(memberCoinWithdraw);
-        //发送提现消息
-        chainProducer.sendAntACoinOutMsg(realUsdtAmountFlow.getId());
-
-        /**
-         * A币卖币规则,卖出100%销毁,30%回流底池溢价
-         */
-        BigDecimal coinUsdtAmountFee = coinUsdtAmount.multiply(new BigDecimal(0.2)).setScale(4,BigDecimal.ROUND_DOWN);
-//        coinUsdtAmount = coinUsdtAmount.multiply(outPercent).setScale(4,BigDecimal.ROUND_DOWN);
-        //金本位底池数量
-        DataDictionaryCustom coinAUsdtPriceDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
-                PoolEnum.COIN_A_USDT_PRICE.getType(),
-                PoolEnum.COIN_A_USDT_PRICE.getCode()
-        );
-        BigDecimal coinAUsdtCnt = new BigDecimal(coinAUsdtPriceDic.getValue());
-        coinAUsdtCnt = coinAUsdtCnt.subtract(coinUsdtAmount).add(coinUsdtAmountFee).setScale(4,BigDecimal.ROUND_DOWN);
-        coinAUsdtPriceDic.setValue(coinAUsdtCnt.toString());
-        dataDictionaryCustomMapper.updateById(coinAUsdtPriceDic);
-        //币本位底池数量
-        DataDictionaryCustom coinACntDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
-                PoolEnum.COIN_A_CNT.getType(),
-                PoolEnum.COIN_A_CNT.getCode()
-        );
-        BigDecimal coinACnt = new BigDecimal(coinACntDic.getValue());
-        coinACnt = coinACnt.subtract(amount).setScale(4,BigDecimal.ROUND_DOWN);
-        coinACntDic.setValue(coinACnt.toString());
-        dataDictionaryCustomMapper.updateById(coinACntDic);
-
-        coinAPrice = coinAUsdtCnt.divide(coinACnt,12,BigDecimal.ROUND_DOWN);
-        aCoinPriceDic.setValue(coinAPrice.toString());
-        dataDictionaryCustomMapper.updateById(aCoinPriceDic);
-
-        chainProducer.sendAntKLineMsg(0);
     }
 
     @Override
@@ -541,7 +234,7 @@
             if (i > 0) {
                 isSuccess = true;
 
-                DappFundFlowEntity frozenAmount = new DappFundFlowEntity(memberId, amount, 9, 2, null, null);
+                DappFundFlowEntity frozenAmount = new DappFundFlowEntity();
                 dappFundFlowDao.insert(frozenAmount);
             }
         }
@@ -565,10 +258,10 @@
             if (i > 0) {
                 isSuccess = true;
 
-                DappFundFlowEntity releaseFrozen = new DappFundFlowEntity(memberId, frozen, 10, 2, null, null);
+                DappFundFlowEntity releaseFrozen = new DappFundFlowEntity();
                 dappFundFlowDao.insert(releaseFrozen);
 
-                DappFundFlowEntity releaseFrozenNegate = new DappFundFlowEntity(memberId, frozen.negate(), 9, 2, null, null);
+                DappFundFlowEntity releaseFrozenNegate = new DappFundFlowEntity();
                 dappFundFlowDao.insert(releaseFrozenNegate);
             }
         }
@@ -581,53 +274,53 @@
 
     @Override
     public void transferAgain(TransferDto transferDto) {
-        Long memberId = transferDto.getMemberId();
-        DappMemberEntity member = dappMemberDao.selectById(memberId);
-        String upgrade = redisUtils.getString("APP_UPGRADE");
-        if ("upgrade".equals(upgrade)) {
-            throw new FebsException("功能升级中");
-        }
-        if ("success".equals(transferDto.getFlag())) {
-            //是否已经加入动能
-            DappSystemProfit dappSystemProfitIng = dappSystemProfitDao.selectByMemberIdAndState(member.getId(), DappSystemProfit.STATE_IN);
-            if(ObjectUtil.isNotEmpty(dappSystemProfitIng)){
-                return;
-            }
-            //插入一条会员入列记录,即加入动能队列
-            DappSystemProfit dappSystemProfit = new DappSystemProfit(member.getId(), transferDto.getAmount());
-            dappSystemProfitDao.insert(dappSystemProfit);
-            DappFundFlowEntity flow = dappFundFlowDao.selectById(transferDto.getId());
-            flow.setFromHash(transferDto.getTxHash());
-            flow.setSystemProfitId(dappSystemProfit.getId());
-            flow.setStatus(DappFundFlowEntity.WITHDRAW_STATUS_AGREE);
-            dappFundFlowDao.updateById(flow);
-
-            //直接拿走0.05个BNB放入技术方
-            DataDictionaryCustom systemProfit = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.SYSTEM_PROFIT.getType(), DataDictionaryEnum.SYSTEM_PROFIT.getCode());
-            String systemProfitStr = StrUtil.isEmpty(systemProfit.getValue()) ? "0.05" : systemProfit.getValue();
-            DappFundFlowEntity systemProfitFlow = new DappFundFlowEntity(1L, new BigDecimal(systemProfitStr), 2, 1, BigDecimal.ZERO, null,dappSystemProfit.getId());
-            dappFundFlowDao.insert(systemProfitFlow);
-            //发送转币消息
-            chainProducer.sendBnbTransferMsg(systemProfitFlow.getId());
-            //直接返利30%给直接上级
-            DappMemberEntity dappMemberEntity = dappMemberDao.selectById(member.getId());
-            String refererId = dappMemberEntity.getRefererId();
-            DappMemberEntity refererMember = dappMemberDao.selectMemberInfoByInviteId(refererId);
-
-            DataDictionaryCustom directProfitSet = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.DIRECT_PROFIT.getType(), DataDictionaryEnum.DIRECT_PROFIT.getCode());
-            BigDecimal directProfitStr = new BigDecimal(StrUtil.isEmpty(directProfitSet.getValue()) ? "0.3" : directProfitSet.getValue());
-            BigDecimal directProfit = (transferDto.getAmount().subtract(new BigDecimal(systemProfitStr))).multiply(directProfitStr).setScale(6,BigDecimal.ROUND_DOWN);
-
-            DappFundFlowEntity fundFlow = new DappFundFlowEntity(refererMember.getId(), directProfit, 3, 1, BigDecimal.ZERO, null,dappSystemProfit.getId());
-            dappFundFlowDao.insert(fundFlow);
-            //发送转币消息
-            chainProducer.sendBnbTransferMsg(fundFlow.getId());
-            //层级奖励30%
-            chainProducer.sendLevelProfitMsg(dappSystemProfit.getId());
-            //发送一个消息,计算当前是否有人可以出局
-            chainProducer.sendMemberOutMsg(dappSystemProfit.getId());
-
-        }
+//        Long memberId = transferDto.getMemberId();
+//        DappMemberEntity member = dappMemberDao.selectById(memberId);
+//        String upgrade = redisUtils.getString("APP_UPGRADE");
+//        if ("upgrade".equals(upgrade)) {
+//            throw new FebsException("功能升级中");
+//        }
+//        if ("success".equals(transferDto.getFlag())) {
+//            //是否已经加入动能
+//            DappSystemProfit dappSystemProfitIng = dappSystemProfitDao.selectByMemberIdAndState(member.getId(), DappSystemProfit.STATE_IN);
+//            if(ObjectUtil.isNotEmpty(dappSystemProfitIng)){
+//                return;
+//            }
+//            //插入一条会员入列记录,即加入动能队列
+//            DappSystemProfit dappSystemProfit = new DappSystemProfit(member.getId(), transferDto.getAmount());
+//            dappSystemProfitDao.insert(dappSystemProfit);
+//            DappFundFlowEntity flow = dappFundFlowDao.selectById(transferDto.getId());
+//            flow.setFromHash(transferDto.getTxHash());
+//            flow.setSystemProfitId(dappSystemProfit.getId());
+//            flow.setStatus(DappFundFlowEntity.WITHDRAW_STATUS_AGREE);
+//            dappFundFlowDao.updateById(flow);
+//
+//            //直接拿走0.05个BNB放入技术方
+//            DataDictionaryCustom systemProfit = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.SYSTEM_PROFIT.getType(), DataDictionaryEnum.SYSTEM_PROFIT.getCode());
+//            String systemProfitStr = StrUtil.isEmpty(systemProfit.getValue()) ? "0.05" : systemProfit.getValue();
+//            DappFundFlowEntity systemProfitFlow = new DappFundFlowEntity(1L, new BigDecimal(systemProfitStr), 2, 1, BigDecimal.ZERO, null,dappSystemProfit.getId());
+//            dappFundFlowDao.insert(systemProfitFlow);
+//            //发送转币消息
+//            chainProducer.sendBnbTransferMsg(systemProfitFlow.getId());
+//            //直接返利30%给直接上级
+//            DappMemberEntity dappMemberEntity = dappMemberDao.selectById(member.getId());
+//            String refererId = dappMemberEntity.getRefererId();
+//            DappMemberEntity refererMember = dappMemberDao.selectMemberInfoByInviteId(refererId);
+//
+//            DataDictionaryCustom directProfitSet = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.DIRECT_PROFIT.getType(), DataDictionaryEnum.DIRECT_PROFIT.getCode());
+//            BigDecimal directProfitStr = new BigDecimal(StrUtil.isEmpty(directProfitSet.getValue()) ? "0.3" : directProfitSet.getValue());
+//            BigDecimal directProfit = (transferDto.getAmount().subtract(new BigDecimal(systemProfitStr))).multiply(directProfitStr).setScale(6,BigDecimal.ROUND_DOWN);
+//
+//            DappFundFlowEntity fundFlow = new DappFundFlowEntity(refererMember.getId(), directProfit, 3, 1, BigDecimal.ZERO, null,dappSystemProfit.getId());
+//            dappFundFlowDao.insert(fundFlow);
+//            //发送转币消息
+//            chainProducer.sendBnbTransferMsg(fundFlow.getId());
+//            //层级奖励30%
+//            chainProducer.sendLevelProfitMsg(dappSystemProfit.getId());
+//            //发送一个消息,计算当前是否有人可以出局
+//            chainProducer.sendMemberOutMsg(dappSystemProfit.getId());
+//
+//        }
     }
 
     public static void main(String[] args) {
@@ -648,230 +341,6 @@
             System.out.println(2);
         }
 
-    }
-
-    @Override
-    public Long transferA(TransferADto transferADto) {
-        DappMemberEntity member = LoginUserUtil.getAppUser();
-        DappMemberEntity dappMemberEntity = dappMemberDao.selectById(member.getId());
-
-        DataDictionaryCustom systemStateDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
-                PoolEnum.SYSTEM.getType(),
-                PoolEnum.SYSTEM.getCode()
-        );
-        String value = systemStateDic.getValue();
-        if("STOP".equals(value)){
-            throw new FebsException("Not yet open");
-        }
-        String upgrade = redisUtils.getString("APP_UPGRADE");
-        if ("upgrade".equals(upgrade)) {
-            throw new FebsException("功能升级中");
-        }
-
-//        if (transferADto.getType() != 2) {
-//            member = dappMemberDao.selectById(member.getId());
-//            if (member.getActiveStatus() == 1) {
-//                throw new FebsException("Do not repeat purchase");
-//            }
-//        }
-        /**
-         * buyType=1,余额购买
-         */
-        if (transferADto.getBuyType() == 1) {
-            DappWalletCoinEntity walletCoin = dappWalletCoinDao.selectByMemberId(member.getId());
-            if (transferADto.getAmount().compareTo(walletCoin.getAvailableAmount()) > 0) {
-                throw new FebsException("Balance Not Enough");
-            }
-
-            updateWalletCoinWithLock(transferADto.getAmount(), member.getId(), 2);
-
-            DappFundFlowEntity fundFlow = new DappFundFlowEntity(
-                    member.getId(),
-                    transferADto.getAmount().negate(),
-                    FundFlowEnum.BUY_A_COIN.getCode(),
-                    2,
-                    transferADto.getFee(),
-                    transferADto.getTxHash());
-            dappFundFlowDao.insert(fundFlow);
-        } else {
-            /**
-             * buyType=2,钱包购买
-             * 4:入金,买入A币
-             */
-            int type = FundFlowEnum.BUY_A_COIN.getCode();
-            // 1-认购 2-充值tfc
-            if (transferADto.getType() == 2) {
-                type = 6;
-            }
-            /**
-             * 第一次请求,生成一条资金流水ID,并且返回。
-             */
-            if (transferADto.getId() == null) {
-                /**
-                 * 查询会员是否已经有正在进行中的入金记录
-                 */
-                DappFundFlowEntity fundFlowOld = dappFundFlowDao.selectBymemberIdAndType(member.getId(),type,DappFundFlowEntity.WITHDRAW_STATUS_ING);
-                if(ObjectUtil.isNotEmpty(fundFlowOld)){
-                    //网络问题导致第二次提交前,未成功就关闭了页面
-                    if (fundFlowOld.getStatus() == 1 && StrUtil.isEmpty(fundFlowOld.getFromHash())) {
-                        dappFundFlowDao.deleteById(fundFlowOld.getId());
-                        throw new FebsException("Refresh and try again");
-                    }
-                }
-                /**
-                 * 入金限制
-                 *  每人总共入金100U
-                 */
-                BigDecimal amountIn = transferADto.getAmount();
-//                if(amountIn.compareTo(new BigDecimal(100)) != 0){
-//                    throw new FebsException("Limit per address 100 USDT");
-//                }
-                /**
-                 * 每单金额得大于100 小于1000 限制
-                 */
-                if(amountIn.compareTo(new BigDecimal(100)) < 0){
-                    throw new FebsException("Min 100");
-                }
-                if(amountIn.compareTo(new BigDecimal(100000)) > 0){
-                    throw new FebsException("Max 100000");
-                }
-
-                BigDecimal result = amountIn.divide(BigDecimal.valueOf(100));
-                if(!result.remainder(BigDecimal.ONE).equals(BigDecimal.ZERO)){
-                    throw new FebsException("Please enter an integer multiple of 100");
-                }
-
-//                BigDecimal amountInLast = dappChargeUsdtMapper.selectByMaxAmountMemberId(member.getId());
-                /**
-                 * 限制用户买入总额,
-                 *  目前每人限一单,总金额限制100U
-                 */
-//                BigDecimal amountInLast = dappChargeUsdtMapper.selectBySumAmountMemberId(member.getId());
-                BigDecimal amountInLast = dappChargeUsdtMapper.selectBySumAmountMemberIdAndDate(member.getId(),DateUtil.today());
-                /**
-                 * 每个地址只能使用一次 限制总额1000U
-                 */
-                BigDecimal amountInAll = amountInLast.add(amountIn);
-                if(getLocalAddress(dappMemberEntity.getAddress())){
-                    if(amountInAll.compareTo(new BigDecimal(100000)) > 0){
-                        BigDecimal add = new BigDecimal(100000).subtract(amountInLast).setScale(0, BigDecimal.ROUND_DOWN);
-                        throw new FebsException("Max "+ add.toString());
-                    }
-                }
-                /**
-                 * 验证账户是否有入金金额的10%的AUSD
-                 */
-                DappUsdtPerkEntity dappUsdtPerkEntity = dappUsdtPerkEntityMapper.selectByMemberId(member.getId());
-                if(ObjectUtil.isEmpty(dappUsdtPerkEntity)){
-                    dappUsdtPerkEntity = new DappUsdtPerkEntity();
-                    dappUsdtPerkEntity.setMemberId(member.getId());
-                    dappUsdtPerkEntityMapper.insert(dappUsdtPerkEntity);
-                }
-                BigDecimal ausdAmount = dappUsdtPerkEntity.getAusdAmount();
-                DataDictionaryCustom ausdPercentDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
-                        PoolEnum.TRANSFER_A_AUSD_PERCENT.getType(),
-                        PoolEnum.TRANSFER_A_AUSD_PERCENT.getCode()
-                );
-                BigDecimal ausdPercent = new BigDecimal(ausdPercentDic.getValue());
-                BigDecimal ausdPercentUsdt = transferADto.getAmount().multiply(ausdPercent);
-
-                DataDictionaryCustom ausdPriceDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
-                        PoolEnum.TRANSFER_A_AUSD_PRICE.getType(),
-                        PoolEnum.TRANSFER_A_AUSD_PRICE.getCode()
-                );
-                BigDecimal ausdPrice = new BigDecimal(ausdPriceDic.getValue());
-                BigDecimal ausdAmountNeed = ausdPercentUsdt.divide(ausdPrice);
-                if(BigDecimal.ZERO.compareTo(ausdAmount) >= 0){
-                    throw new FebsException("AUSDT数量不足");
-                }
-                if(ausdAmountNeed.compareTo(ausdAmount) > 0){
-                    throw new FebsException("AUSDT数量不足");
-                }
-                /**
-                 * 出局复投要求等于戓大于自己上次投资金额
-                 */
-                BigDecimal maxAmount = dappChargeUsdtMapper.selectByMaxAmountMemberId(member.getId());
-                if(maxAmount.compareTo(transferADto.getAmount()) > 0){
-                    throw new FebsException("投资金额不能小于"+maxAmount.setScale(4,BigDecimal.ROUND_DOWN));
-                }
-                //生成一条进行中的入金资金流水记录
-                DappFundFlowEntity fundFlow = new DappFundFlowEntity(
-                        member.getId(),
-                        transferADto.getAmount(),
-                        type,
-                        1,
-                        ausdAmountNeed,
-                        transferADto.getTxHash());
-
-
-//                DappFundFlowEntity fundFlow = new DappFundFlowEntity(
-//                        member.getId(),
-//                        transferADto.getAmount(),
-//                        type,
-//                        1,
-//                        new BigDecimal("1"),
-//                        transferADto.getTxHash());
-                dappFundFlowDao.insert(fundFlow);
-                return fundFlow.getId();
-            }
-
-            if ("success".equals(transferADto.getFlag())) {
-                DappFundFlowEntity flow = dappFundFlowDao.selectById(transferADto.getId());
-                if(DappFundFlowEntity.WITHDRAW_STATUS_AGREE == flow.getStatus()){
-                    throw new FebsException("请勿重复提交");
-                }
-
-                /**
-                 * 链上转账的hash值
-                 */
-                flow.setFromHash(transferADto.getTxHash());
-                dappFundFlowDao.updateById(flow);
-//                /**
-//                 * 生成会员入金买A币的记录
-//                 */
-//                DappChargeUsdtEntity dappChargeUsdtEntity = new DappChargeUsdtEntity(
-//                        member.getId(),
-//                        dappMemberEntity.getAddress(),
-//                        transferADto.getTxHash(),
-//                        2,
-//                        transferADto.getAmount(),
-//                        BigDecimal.ZERO,
-//                        BigDecimal.ZERO);
-//                dappChargeUsdtMapper.insert(dappChargeUsdtEntity);
-//                /**
-//                 * 减少用户的AUSD数量
-//                 */
-//                DappUsdtPerkEntity dappUsdtPerkEntity = dappUsdtPerkEntityMapper.selectByMemberId(member.getId());
-//                BigDecimal ausdAmount = dappUsdtPerkEntity.getAusdAmount();
-//                ausdAmount = ausdAmount.subtract(flow.getFee()).setScale(4,BigDecimal.ROUND_DOWN);
-//                dappUsdtPerkEntity.setAusdAmount(ausdAmount);
-//                dappUsdtPerkEntityMapper.updateById(dappUsdtPerkEntity);
-//                /**
-//                 * 流水关联用户购买记录
-//                 */
-//                flow.setSystemProfitId(dappChargeUsdtEntity.getId());
-//                /**
-//                 * 链上转账的hash值
-//                 */
-//                flow.setFromHash(transferADto.getTxHash());
-//                flow.setStatus(DappFundFlowEntity.WITHDRAW_STATUS_AGREE);
-//                dappFundFlowDao.updateById(flow);
-//                /**
-//                 * 发送消息处理返利逻辑
-//                 */
-//                chainProducer.sendAntACoinInMsg(flow.getId());
-//                /**
-//                 * 发送消息处理代理升级
-//                 */
-//                chainProducer.sendAntMemberLevelMsg(member.getId());
-            } else {
-                DappFundFlowEntity flow = dappFundFlowDao.selectById(transferADto.getId());
-                if (flow.getStatus() == 1) {
-                    dappFundFlowDao.deleteById(transferADto.getId());
-                }
-            }
-        }
-        return null;
     }
 
     public boolean getLocalAddress(String address){
@@ -905,66 +374,66 @@
          * 4、增加闪对钱包
          * 5、增加流水
          */
-        DappMemberEntity member = LoginUserUtil.getAppUser();
-        DappMemberEntity dappMemberEntity = dappMemberDao.selectById(member.getId());
-
-        BigDecimal aCoinCnt = mineToCoinDto.getACoinCnt();
-        if(BigDecimal.ZERO.compareTo(aCoinCnt) >= 0){
-            throw new FebsException("输入正确的数量");
-        }
-
-        DappWalletMineEntity dappWalletMineEntity = dappWalletMineDao.selectByMemberId(dappMemberEntity.getId());
-        BigDecimal availableAmount = dappWalletMineEntity.getAvailableAmount();
-        if(availableAmount.compareTo(aCoinCnt) < 0){
-            throw new FebsException("数量不足");
-        }
-        //减少资产钱包
-        this.updateWalletMineWithLock(aCoinCnt,dappMemberEntity.getId(),2);
-        //插入资产闪对的流水
-        DappFundFlowEntity aCoinCntFlow = new DappFundFlowEntity(
-                dappMemberEntity.getId(),
-                aCoinCnt.negate(),
-                FundFlowEnum.WALLET_MINE_TO_COIN.getCode(),
-                2,
-                BigDecimal.ZERO);
-        dappFundFlowDao.insert(aCoinCntFlow);
-        //闪对钱包3% 手续费(扣币)
-        DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
-                PoolEnum.WALLET_MINE_TO_COIN_PERCENT.getType(),
-                PoolEnum.WALLET_MINE_TO_COIN_PERCENT.getCode());
-        BigDecimal feePercent = new BigDecimal(StrUtil.isEmpty(dic.getValue()) ? "0.03" : dic.getValue());
-        //手续费
-        BigDecimal feeCnt = aCoinCnt.multiply(feePercent).setScale(4,BigDecimal.ROUND_DOWN);
-        //闪对钱包获取的
-        BigDecimal aCoinCntReal = aCoinCnt.subtract(feeCnt).setScale(4, BigDecimal.ROUND_DOWN);
-        //增加闪对钱包
-        this.updateWalletCoinWithLock(aCoinCntReal,dappMemberEntity.getId(),1);
-        //插入资产闪对的流水
-        DappFundFlowEntity dappFundFlowEntity = new DappFundFlowEntity(
-                dappMemberEntity.getId(),
-                aCoinCntReal,
-                FundFlowEnum.WALLET_MINE_TO_COIN.getCode(),
-                2,
-                BigDecimal.ZERO);
-        dappFundFlowDao.insert(dappFundFlowEntity);
-
-        //插入资产闪对手续费的流水
-        DappFundFlowEntity memberFeeflow = new DappFundFlowEntity(
-                dappMemberEntity.getId(),
-                feeCnt.negate(),
-                FundFlowEnum.WALLET_MINE_TO_COIN_FEE.getCode(),
-                2,
-                BigDecimal.ZERO);
-        dappFundFlowDao.insert(memberFeeflow);
-        //插入资产闪对手续费的流水
-        DappFundFlowEntity dappFundFlowEntityFee = new DappFundFlowEntity(
-                295L,
-                feeCnt,
-                FundFlowEnum.WALLET_MINE_TO_COIN_FEE.getCode(),
-                2,
-                BigDecimal.ZERO);
-        dappFundFlowDao.insert(dappFundFlowEntityFee);
-        this.updateWalletMineWithLock(feeCnt,295L,1);
+//        DappMemberEntity member = LoginUserUtil.getAppUser();
+//        DappMemberEntity dappMemberEntity = dappMemberDao.selectById(member.getId());
+//
+//        BigDecimal aCoinCnt = mineToCoinDto.getACoinCnt();
+//        if(BigDecimal.ZERO.compareTo(aCoinCnt) >= 0){
+//            throw new FebsException("输入正确的数量");
+//        }
+//
+//        DappWalletMineEntity dappWalletMineEntity = dappWalletMineDao.selectByMemberId(dappMemberEntity.getId());
+//        BigDecimal availableAmount = dappWalletMineEntity.getAvailableAmount();
+//        if(availableAmount.compareTo(aCoinCnt) < 0){
+//            throw new FebsException("数量不足");
+//        }
+//        //减少资产钱包
+//        this.updateWalletMineWithLock(aCoinCnt,dappMemberEntity.getId(),2);
+//        //插入资产闪对的流水
+//        DappFundFlowEntity aCoinCntFlow = new DappFundFlowEntity(
+//                dappMemberEntity.getId(),
+//                aCoinCnt.negate(),
+//                FundFlowEnum.WALLET_MINE_TO_COIN.getCode(),
+//                2,
+//                BigDecimal.ZERO);
+//        dappFundFlowDao.insert(aCoinCntFlow);
+//        //闪对钱包3% 手续费(扣币)
+//        DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+//                PoolEnum.WALLET_MINE_TO_COIN_PERCENT.getType(),
+//                PoolEnum.WALLET_MINE_TO_COIN_PERCENT.getCode());
+//        BigDecimal feePercent = new BigDecimal(StrUtil.isEmpty(dic.getValue()) ? "0.03" : dic.getValue());
+//        //手续费
+//        BigDecimal feeCnt = aCoinCnt.multiply(feePercent).setScale(4,BigDecimal.ROUND_DOWN);
+//        //闪对钱包获取的
+//        BigDecimal aCoinCntReal = aCoinCnt.subtract(feeCnt).setScale(4, BigDecimal.ROUND_DOWN);
+//        //增加闪对钱包
+//        this.updateWalletCoinWithLock(aCoinCntReal,dappMemberEntity.getId(),1);
+//        //插入资产闪对的流水
+//        DappFundFlowEntity dappFundFlowEntity = new DappFundFlowEntity(
+//                dappMemberEntity.getId(),
+//                aCoinCntReal,
+//                FundFlowEnum.WALLET_MINE_TO_COIN.getCode(),
+//                2,
+//                BigDecimal.ZERO);
+//        dappFundFlowDao.insert(dappFundFlowEntity);
+//
+//        //插入资产闪对手续费的流水
+//        DappFundFlowEntity memberFeeflow = new DappFundFlowEntity(
+//                dappMemberEntity.getId(),
+//                feeCnt.negate(),
+//                FundFlowEnum.WALLET_MINE_TO_COIN_FEE.getCode(),
+//                2,
+//                BigDecimal.ZERO);
+//        dappFundFlowDao.insert(memberFeeflow);
+//        //插入资产闪对手续费的流水
+//        DappFundFlowEntity dappFundFlowEntityFee = new DappFundFlowEntity(
+//                295L,
+//                feeCnt,
+//                FundFlowEnum.WALLET_MINE_TO_COIN_FEE.getCode(),
+//                2,
+//                BigDecimal.ZERO);
+//        dappFundFlowDao.insert(dappFundFlowEntityFee);
+//        this.updateWalletMineWithLock(feeCnt,295L,1);
     }
 
     @Override
@@ -976,115 +445,78 @@
         if ("upgrade".equals(upgrade)) {
             throw new FebsException("功能升级中");
         }
+        BigDecimal amountIn = transferAusdDto.getAmount();
+        if(BigDecimal.ZERO.compareTo(amountIn) >= 0){
+            throw new FebsException("请输入正确的金额");
+        }
 
-//        if (transferAusdDto.getType() != 2) {
-//            member = dappMemberDao.selectById(member.getId());
-//            if (member.getActiveStatus() == 1) {
-//                throw new FebsException("Do not repeat purchase");
-//            }
-//        }
         /**
-         * buyType=1,余额购买
+         * 充值
          */
-        if (transferAusdDto.getBuyType() == 1) {
-            DappWalletCoinEntity walletCoin = dappWalletCoinDao.selectByMemberId(member.getId());
-            if (transferAusdDto.getAmount().compareTo(walletCoin.getAvailableAmount()) > 0) {
-                throw new FebsException("Balance Not Enough");
+        int type = FundFlowEnum.CHARGE_USDT.getCode();
+        /**
+         * 第一次请求,生成一条资金流水ID,并且返回。
+         */
+        if (transferAusdDto.getId() == null) {
+            /**
+             * 查询会员是否已经有正在进行中的入金记录
+             */
+            DappFundFlowEntity fundFlowOld = dappFundFlowDao.selectBymemberIdAndType(dappMemberEntity.getId(),type,DappFundFlowEntity.WITHDRAW_STATUS_ING);
+            if(ObjectUtil.isNotEmpty(fundFlowOld)){
+                //网络问题导致第二次提交前,未成功就关闭了页面
+                if (fundFlowOld.getStatus() == 1 && StrUtil.isEmpty(fundFlowOld.getFromHash())) {
+                    dappFundFlowDao.deleteById(fundFlowOld.getId());
+                    throw new FebsException("Refresh and try again");
+                }
             }
-
-            updateWalletCoinWithLock(transferAusdDto.getAmount(), member.getId(), 2);
-
+            //生成一条进行中的入金资金流水记录
             DappFundFlowEntity fundFlow = new DappFundFlowEntity(
-                    member.getId(),
-                    transferAusdDto.getAmount().negate(),
-                    FundFlowEnum.BUY_AUSD_COIN.getCode(),
-                    2,
+                    dappMemberEntity.getId(),
+                    transferAusdDto.getAmount().multiply(new BigDecimal(7)),
+                    type,
+                    1,
                     transferAusdDto.getFee(),
                     transferAusdDto.getTxHash());
             dappFundFlowDao.insert(fundFlow);
+            return fundFlow.getId();
+        }
+
+        DappFundFlowEntity flow = dappFundFlowDao.selectById(transferAusdDto.getId());
+        if ("success".equals(transferAusdDto.getFlag())) {
+            if(DappFundFlowEntity.WITHDRAW_STATUS_AGREE == flow.getStatus()){
+                throw new FebsException("请勿重复提交");
+            }
+            /**
+             * 链上转账的hash值
+             */
+            flow.setFlowType(AccountFlowEnum.AMOUNT.getCode());
+            flow.setFromHash(transferAusdDto.getTxHash());
+            flow.setStatus(DappFundFlowEntity.WITHDRAW_STATUS_AGREE);
+            dappFundFlowDao.updateById(flow);
+            BigDecimal amount = transferAusdDto.getAmount();
+            /**
+             * 增加用户的余额
+             */
+            dappWalletCoinDao.addTotalAndaddAvailableByMemberId(member.getId(),amount.multiply(new BigDecimal(7)));
+
+            DappChargeUsdtEntity dappChargeUsdtEntity = new DappChargeUsdtEntity();
+            dappChargeUsdtEntity.setMemberId(member.getId());
+            dappChargeUsdtEntity.setMemberAddress(member.getAddress());
+            dappChargeUsdtEntity.setMemberHash(transferAusdDto.getTxHash());
+            dappChargeUsdtEntity.setStatus(2);
+            dappChargeUsdtEntity.setTotalCnt(amount);
+            dappChargeUsdtEntity.setRealCnt(amount.multiply(new BigDecimal(7)));
+            dappChargeUsdtMapper.insert(dappChargeUsdtEntity);
         } else {
-            /**
-             * buyType=2,钱包购买
-             * 4:入金,买入A币
-             */
-            int type = FundFlowEnum.BUY_AUSD_COIN.getCode();
-            // 1-认购 2-充值tfc
-            if (transferAusdDto.getType() == 2) {
-                type = 6;
-            }
-            /**
-             * 第一次请求,生成一条资金流水ID,并且返回。
-             */
-            if (transferAusdDto.getId() == null) {
-                /**
-                 * 查询会员是否已经有正在进行中的入金记录
-                 */
-                DappFundFlowEntity fundFlowOld = dappFundFlowDao.selectBymemberIdAndType(member.getId(),type,DappFundFlowEntity.WITHDRAW_STATUS_ING);
-                if(ObjectUtil.isNotEmpty(fundFlowOld)){
-                    //网络问题导致第二次提交前,未成功就关闭了页面
-                    if (fundFlowOld.getStatus() == 1 && StrUtil.isEmpty(fundFlowOld.getFromHash())) {
-                        dappFundFlowDao.deleteById(fundFlowOld.getId());
-                        throw new FebsException("Refresh and try again");
-                    }
-                }
-                //生成一条进行中的入金资金流水记录
-                DappFundFlowEntity fundFlow = new DappFundFlowEntity(
-                        member.getId(),
-                        transferAusdDto.getAmount(),
-                        type,
-                        1,
-                        transferAusdDto.getFee(),
-                        transferAusdDto.getTxHash());
-                dappFundFlowDao.insert(fundFlow);
-                return fundFlow.getId();
-            }
-
-            if ("success".equals(transferAusdDto.getFlag())) {
-                DappFundFlowEntity flow = dappFundFlowDao.selectById(transferAusdDto.getId());
-                if(DappFundFlowEntity.WITHDRAW_STATUS_AGREE == flow.getStatus()){
-                    throw new FebsException("请勿重复提交");
-                }
-                /**
-                 * 增加用户的AUSD数量
-                 */
-                BigDecimal amount = transferAusdDto.getAmount();
-                DataDictionaryCustom ausdPriceDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
-                        PoolEnum.TRANSFER_A_AUSD_PRICE.getType(),
-                        PoolEnum.TRANSFER_A_AUSD_PRICE.getCode()
-                );
-                BigDecimal ausdPrice = new BigDecimal(ausdPriceDic.getValue());
-                BigDecimal ausdCnt = amount.divide(ausdPrice, 4, BigDecimal.ROUND_DOWN);
-
-                DappUsdtPerkEntity dappUsdtPerkEntity = dappUsdtPerkEntityMapper.selectByMemberId(member.getId());
-                if(ObjectUtil.isEmpty(dappUsdtPerkEntity)){
-                    dappUsdtPerkEntity = new DappUsdtPerkEntity();
-                    dappUsdtPerkEntity.setMemberId(member.getId());
-                    dappUsdtPerkEntity.setAmount(BigDecimal.ZERO);
-                    dappUsdtPerkEntity.setAusdAmount(BigDecimal.ZERO);
-                    dappUsdtPerkEntityMapper.insert(dappUsdtPerkEntity);
-                }
-                BigDecimal ausdAmount = dappUsdtPerkEntity.getAusdAmount();
-                ausdAmount = ausdAmount.add(ausdCnt).setScale(4,BigDecimal.ROUND_DOWN);
-                dappUsdtPerkEntity.setAusdAmount(ausdAmount);
-                dappUsdtPerkEntityMapper.updateById(dappUsdtPerkEntity);
-                /**
-                 * 链上转账的hash值
-                 */
-                flow.setFromHash(transferAusdDto.getTxHash());
-                flow.setStatus(DappFundFlowEntity.WITHDRAW_STATUS_AGREE);
-                dappFundFlowDao.updateById(flow);
-            } else {
-                DappFundFlowEntity flow = dappFundFlowDao.selectById(transferAusdDto.getId());
-                if (flow.getStatus() == 1) {
-                    dappFundFlowDao.deleteById(transferAusdDto.getId());
-                }
+            if (flow.getStatus() == 1) {
+                dappFundFlowDao.deleteById(transferAusdDto.getId());
             }
         }
         return null;
     }
 
     @Override
-    public List<DappFundFlowVo> getRecordVoInPage(RecordInPageDto recordInPageDto) {
+    public IPage<DappFundFlowVo> getRecordVoInPage(RecordInPageDto recordInPageDto) {
         Page<DappFundFlowVo> page = new Page<>(recordInPageDto.getPageNum(), recordInPageDto.getPageSize());
 
         DappMemberEntity member = LoginUserUtil.getAppUser();
@@ -1092,168 +524,320 @@
         if (recordInPageDto.getType() != null && recordInPageDto.getType() != 0) {
             dappFundFlowEntity.setType(recordInPageDto.getType());
         }
+        dappFundFlowEntity.setFlowType(recordInPageDto.getFlowType());
         dappFundFlowEntity.setMemberId(member.getId());
         IPage<DappFundFlowVo> records = dappFundFlowDao.selectVoInPage(page, dappFundFlowEntity);
-        return records.getRecords();
+        return records;
     }
 
     @Override
     public void roundCoin(RoundCoinDto roundCoinDto) {
-        DappMemberEntity member = LoginUserUtil.getAppUser();
-        DappMemberEntity dappMemberEntity = dappMemberDao.selectById(member.getId());
-
-        String address = roundCoinDto.getAddress();
-        DappMemberEntity memberParent = dappMemberDao.selectByAddress(address, null);
-        if(ObjectUtil.isEmpty(memberParent)){
-            throw new FebsException("请输入正确的地址");
-        }
-
-        BigDecimal coinCnt = roundCoinDto.getCoinCnt();
-        if(BigDecimal.ZERO.compareTo(coinCnt) >= 0){
-            throw new FebsException("输入正确的数量");
-        }
-
-        DappWalletCoinEntity dappWalletCoinEntity = dappWalletCoinDao.selectByMemberId(dappMemberEntity.getId());
-        BigDecimal availableAmount = dappWalletCoinEntity.getAvailableAmount();
-        if(availableAmount.compareTo(coinCnt) < 0){
-            throw new FebsException("数量不足");
-        }
-        //减少闪兑钱包
-        this.updateWalletCoinWithLock(coinCnt,dappMemberEntity.getId(),2);
-        //插入资产闪对的流水
-        DappFundFlowEntity aCoinCntFlow = new DappFundFlowEntity(
-                dappMemberEntity.getId(),
-                coinCnt.negate(),
-                FundFlowEnum.ANDAO_MEMBER_TO_MENBER.getCode(),
-                2,
-                BigDecimal.ZERO,
-                dappMemberEntity.getAddress(),
-                memberParent.getAddress(),
-                memberParent.getId());
-        dappFundFlowDao.insert(aCoinCntFlow);
-        //闪对钱包20% 手续费(扣币)
-        DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
-                PoolEnum.ANDAO_MEMBER_TO_MENBER_PERCENT.getType(),
-                PoolEnum.ANDAO_MEMBER_TO_MENBER_PERCENT.getCode());
-        BigDecimal feePercent = new BigDecimal(StrUtil.isEmpty(dic.getValue()) ? "0.2" : dic.getValue());
-        //手续费
-        BigDecimal feeCnt = coinCnt.multiply(feePercent).setScale(4,BigDecimal.ROUND_DOWN);
-        if(AppContants.YL_MEMBER_ID.equals(member.getId())
-        || AppContants.YL_MEMBER_ID_TWO.equals(member.getId())){
-            feeCnt = BigDecimal.ZERO;
-        }
-        //闪对钱包获取的
-        BigDecimal aCoinCntReal = coinCnt.subtract(feeCnt).setScale(4, BigDecimal.ROUND_DOWN);
-        //增加闪对钱包
-        this.updateWalletCoinWithLock(aCoinCntReal,memberParent.getId(),1);
-        //插入资产闪对的流水
-        DappFundFlowEntity dappFundFlowEntity = new DappFundFlowEntity(
-                memberParent.getId(),
-                aCoinCntReal,
-                FundFlowEnum.ANDAO_MEMBER_TO_MENBER.getCode(),
-                2,
-                BigDecimal.ZERO,
-                dappMemberEntity.getAddress(),
-                memberParent.getAddress(),
-                dappMemberEntity.getId());
-        dappFundFlowDao.insert(dappFundFlowEntity);
-
-        if(BigDecimal.ZERO.compareTo(feeCnt) < 0){
-            //金本位底池数量
-            DataDictionaryCustom coinAUsdtPriceDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
-                    PoolEnum.COIN_A_USDT_PRICE.getType(),
-                    PoolEnum.COIN_A_USDT_PRICE.getCode()
-            );
-            BigDecimal coinAUsdtCnt = new BigDecimal(coinAUsdtPriceDic.getValue());
-            //币本位底池数量
-            DataDictionaryCustom coinACntDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
-                    PoolEnum.COIN_A_CNT.getType(),
-                    PoolEnum.COIN_A_CNT.getCode()
-            );
-            BigDecimal coinACnt = new BigDecimal(coinACntDic.getValue());
-            coinACnt = coinACnt.subtract(feeCnt).setScale(4,BigDecimal.ROUND_DOWN);
-            coinACntDic.setValue(coinACnt.toString());
-            dataDictionaryCustomMapper.updateById(coinACntDic);
-
-            DataDictionaryCustom aCoinPriceDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
-                    PoolEnum.COIN_A_PRICE.getType(),
-                    PoolEnum.COIN_A_PRICE.getCode()
-            );
-            BigDecimal coinAPrice = new BigDecimal(aCoinPriceDic.getValue());
-            coinAPrice = coinAUsdtCnt.divide(coinACnt,12,BigDecimal.ROUND_DOWN);
-            aCoinPriceDic.setValue(coinAPrice.toString());
-            dataDictionaryCustomMapper.updateById(aCoinPriceDic);
-
-            chainProducer.sendAntKLineMsg(0);
-        }
+//        DappMemberEntity member = LoginUserUtil.getAppUser();
+//        DappMemberEntity dappMemberEntity = dappMemberDao.selectById(member.getId());
+//
+//        String address = roundCoinDto.getAddress();
+//        DappMemberEntity memberParent = dappMemberDao.selectByAddress(address, null);
+//        if(ObjectUtil.isEmpty(memberParent)){
+//            throw new FebsException("请输入正确的地址");
+//        }
+//
+//        BigDecimal coinCnt = roundCoinDto.getCoinCnt();
+//        if(BigDecimal.ZERO.compareTo(coinCnt) >= 0){
+//            throw new FebsException("输入正确的数量");
+//        }
+//
+//        DappWalletCoinEntity dappWalletCoinEntity = dappWalletCoinDao.selectByMemberId(dappMemberEntity.getId());
+//        BigDecimal availableAmount = dappWalletCoinEntity.getAvailableAmount();
+//        if(availableAmount.compareTo(coinCnt) < 0){
+//            throw new FebsException("数量不足");
+//        }
+//        //减少闪兑钱包
+//        this.updateWalletCoinWithLock(coinCnt,dappMemberEntity.getId(),2);
+//        //插入资产闪对的流水
+//        DappFundFlowEntity aCoinCntFlow = new DappFundFlowEntity(
+//                dappMemberEntity.getId(),
+//                coinCnt.negate(),
+//                FundFlowEnum.ANDAO_MEMBER_TO_MENBER.getCode(),
+//                2,
+//                BigDecimal.ZERO,
+//                dappMemberEntity.getAddress(),
+//                memberParent.getAddress(),
+//                memberParent.getId());
+//        dappFundFlowDao.insert(aCoinCntFlow);
+//        //闪对钱包20% 手续费(扣币)
+//        DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+//                PoolEnum.ANDAO_MEMBER_TO_MENBER_PERCENT.getType(),
+//                PoolEnum.ANDAO_MEMBER_TO_MENBER_PERCENT.getCode());
+//        BigDecimal feePercent = new BigDecimal(StrUtil.isEmpty(dic.getValue()) ? "0.2" : dic.getValue());
+//        //手续费
+//        BigDecimal feeCnt = coinCnt.multiply(feePercent).setScale(4,BigDecimal.ROUND_DOWN);
+//        if(AppContants.YL_MEMBER_ID.equals(member.getId())
+//        || AppContants.YL_MEMBER_ID_TWO.equals(member.getId())){
+//            feeCnt = BigDecimal.ZERO;
+//        }
+//        //闪对钱包获取的
+//        BigDecimal aCoinCntReal = coinCnt.subtract(feeCnt).setScale(4, BigDecimal.ROUND_DOWN);
+//        //增加闪对钱包
+//        this.updateWalletCoinWithLock(aCoinCntReal,memberParent.getId(),1);
+//        //插入资产闪对的流水
+//        DappFundFlowEntity dappFundFlowEntity = new DappFundFlowEntity(
+//                memberParent.getId(),
+//                aCoinCntReal,
+//                FundFlowEnum.ANDAO_MEMBER_TO_MENBER.getCode(),
+//                2,
+//                BigDecimal.ZERO,
+//                dappMemberEntity.getAddress(),
+//                memberParent.getAddress(),
+//                dappMemberEntity.getId());
+//        dappFundFlowDao.insert(dappFundFlowEntity);
+//
+//        if(BigDecimal.ZERO.compareTo(feeCnt) < 0){
+//            //金本位底池数量
+//            DataDictionaryCustom coinAUsdtPriceDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+//                    PoolEnum.COIN_A_USDT_PRICE.getType(),
+//                    PoolEnum.COIN_A_USDT_PRICE.getCode()
+//            );
+//            BigDecimal coinAUsdtCnt = new BigDecimal(coinAUsdtPriceDic.getValue());
+//            //币本位底池数量
+//            DataDictionaryCustom coinACntDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+//                    PoolEnum.COIN_A_CNT.getType(),
+//                    PoolEnum.COIN_A_CNT.getCode()
+//            );
+//            BigDecimal coinACnt = new BigDecimal(coinACntDic.getValue());
+//            coinACnt = coinACnt.subtract(feeCnt).setScale(4,BigDecimal.ROUND_DOWN);
+//            coinACntDic.setValue(coinACnt.toString());
+//            dataDictionaryCustomMapper.updateById(coinACntDic);
+//
+//            DataDictionaryCustom aCoinPriceDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+//                    PoolEnum.COIN_A_PRICE.getType(),
+//                    PoolEnum.COIN_A_PRICE.getCode()
+//            );
+//            BigDecimal coinAPrice = new BigDecimal(aCoinPriceDic.getValue());
+//            coinAPrice = coinAUsdtCnt.divide(coinACnt,12,BigDecimal.ROUND_DOWN);
+//            aCoinPriceDic.setValue(coinAPrice.toString());
+//            dataDictionaryCustomMapper.updateById(aCoinPriceDic);
+//
+//            chainProducer.sendAntKLineMsg(0);
+//        }
     }
 
     @Override
     public void roundCoinAusdt(RoundCoinDto roundCoinDto) {
 
-        DappMemberEntity member = LoginUserUtil.getAppUser();
-        DappMemberEntity dappMemberEntity = dappMemberDao.selectById(member.getId());
+//        DappMemberEntity member = LoginUserUtil.getAppUser();
+//        DappMemberEntity dappMemberEntity = dappMemberDao.selectById(member.getId());
+//
+//        String address = roundCoinDto.getAddress();
+//        DappMemberEntity memberParent = dappMemberDao.selectByAddress(address, null);
+//        if(ObjectUtil.isEmpty(memberParent)){
+//            throw new FebsException("请输入正确的地址");
+//        }
+//
+//        /**
+//         * 转ausdt,只能推广线上
+//         */
+//        String refererIdsDone = dappMemberEntity.getRefererIds();
+//        String inviteIdDone = dappMemberEntity.getInviteId();
+//        String refererIdsOther = memberParent.getRefererIds();
+//        String inviteId1Other = memberParent.getInviteId();
+//        if(!(StrUtil.contains(refererIdsOther,inviteIdDone) || StrUtil.contains(refererIdsDone,inviteId1Other))){
+//            throw new FebsException("不满足互转规则");
+//        }
+//
+//        BigDecimal coinCnt = roundCoinDto.getCoinCnt();
+//        if(BigDecimal.ZERO.compareTo(coinCnt) >= 0){
+//            throw new FebsException("输入正确的数量");
+//        }
+//
+//        DappUsdtPerkEntity dappUsdtPerkEntity = dappUsdtPerkEntityMapper.selectByMemberId(dappMemberEntity.getId());
+//        BigDecimal availableAmount = dappUsdtPerkEntity.getAusdAmount();
+//        if(availableAmount.compareTo(coinCnt) < 0){
+//            throw new FebsException("数量不足");
+//        }
+//        dappUsdtPerkEntity.setAusdAmount(availableAmount.subtract(coinCnt));
+//        dappUsdtPerkEntityMapper.updateById(dappUsdtPerkEntity);
+//        //插入资产闪对的流水
+//        DappFundFlowEntity aCoinCntFlow = new DappFundFlowEntity(
+//                dappMemberEntity.getId(),
+//                coinCnt.negate(),
+//                FundFlowEnum.AUSDT_MEMBER_TO_MENBER.getCode(),
+//                2,
+//                BigDecimal.ZERO,
+//                dappMemberEntity.getAddress(),
+//                memberParent.getAddress(),
+//                memberParent.getId());
+//        dappFundFlowDao.insert(aCoinCntFlow);
+//
+//        DappUsdtPerkEntity parentEntity = dappUsdtPerkEntityMapper.selectByMemberId(memberParent.getId());
+//        if(ObjectUtil.isEmpty(parentEntity)){
+//            parentEntity = new DappUsdtPerkEntity();
+//            parentEntity.setMemberId(memberParent.getId());
+//            dappUsdtPerkEntityMapper.insert(parentEntity);
+//        }
+//        BigDecimal availableAmountParent = ObjectUtil.isEmpty(parentEntity.getAusdAmount()) ? BigDecimal.ZERO : parentEntity.getAusdAmount();
+//        parentEntity.setAusdAmount(availableAmountParent.add(coinCnt));
+//        dappUsdtPerkEntityMapper.updateById(parentEntity);
+//        //插入资产闪对的流水
+//        DappFundFlowEntity aCoinCntFlowParent = new DappFundFlowEntity(
+//                memberParent.getId(),
+//                coinCnt,
+//                FundFlowEnum.AUSDT_MEMBER_TO_MENBER.getCode(),
+//                2,
+//                BigDecimal.ZERO,
+//                dappMemberEntity.getAddress(),
+//                memberParent.getAddress(),
+//                dappMemberEntity.getId());
+//        dappFundFlowDao.insert(aCoinCntFlowParent);
+    }
 
-        String address = roundCoinDto.getAddress();
-        DappMemberEntity memberParent = dappMemberDao.selectByAddress(address, null);
-        if(ObjectUtil.isEmpty(memberParent)){
-            throw new FebsException("请输入正确的地址");
+    @Override
+    public FebsResponse withdrawAgree(Long id) {
+        DappFundFlowEntity dappFundFlowEntity = dappFundFlowDao.selectById(id);
+
+        if(FundFlowEnum.WITHDRAW_USDT.getCode() != dappFundFlowEntity.getType()){
+            return new FebsResponse().fail().message("该记录不存在");
         }
+        if(DappFundFlowEntity.WITHDRAW_STATUS_ING != dappFundFlowEntity.getStatus()){
+            return new FebsResponse().fail().message("提现记录不是进行中状态");
+        }
+        DappMemberEntity dappMemberEntity = dappMemberDao.selectById(dappFundFlowEntity.getMemberId());
+        if(ObjectUtil.isEmpty(dappMemberEntity)) {
+            return new FebsResponse().fail().message("会员信息不存在");
+        }
+        MemberCoinWithdrawEntity memberCoinWithdrawEntity = memberCoinWithdrawDao.selectByFlowId(dappMemberEntity.getId(),dappFundFlowEntity.getId());
+        if(ObjectUtil.isEmpty(memberCoinWithdrawEntity)){
+            return new FebsResponse().fail().message("该记录不存在");
+        }
+        if(MemberCoinWithdrawEntity.STATUS_DOING != memberCoinWithdrawEntity.getStatus()){
+            return new FebsResponse().fail().message("提现记录不是进行中状态");
+        }
+        dappFundFlowEntity.setStatus(DappFundFlowEntity.WITHDRAW_STATUS_AGREE);
+        dappFundFlowDao.updateById(dappFundFlowEntity);
+
+        memberCoinWithdrawEntity.setStatus(MemberCoinWithdrawEntity.STATUS_YES);
+        memberCoinWithdrawEntity.setIsInside(MemberCoinWithdrawEntity.ISINSIDE_NO);
+        memberCoinWithdrawDao.updateById(memberCoinWithdrawEntity);
 
         /**
-         * 转ausdt,只能推广线上
+         * 提现手续费10%进入资产管理池
+         * USDT_ORDER_PERCENT
          */
-        String refererIdsDone = dappMemberEntity.getRefererIds();
-        String inviteIdDone = dappMemberEntity.getInviteId();
-        String refererIdsOther = memberParent.getRefererIds();
-        String inviteId1Other = memberParent.getInviteId();
-        if(!(StrUtil.contains(refererIdsOther,inviteIdDone) || StrUtil.contains(refererIdsDone,inviteId1Other))){
-            throw new FebsException("不满足互转规则");
-        }
+        BigDecimal withdrawFee = dappFundFlowEntity.getFee();
+        if(BigDecimal.ZERO.compareTo(withdrawFee) < 0){
+            BigDecimal addPoor = withdrawFee.multiply(new BigDecimal(7));
 
-        BigDecimal coinCnt = roundCoinDto.getCoinCnt();
-        if(BigDecimal.ZERO.compareTo(coinCnt) >= 0){
-            throw new FebsException("输入正确的数量");
-        }
+            DataDictionaryCustom packageScorePriceDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+                    DataDictionaryEnum.PACKAGE_SCORE_PRICE.getType(),
+                    DataDictionaryEnum.PACKAGE_SCORE_PRICE.getCode()
+            );
+            DataDictionaryCustom packageTotalScoreDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+                    DataDictionaryEnum.PACKAGE_TOTAL_SCORE.getType(),
+                    DataDictionaryEnum.PACKAGE_TOTAL_SCORE.getCode()
+            );
+            BigDecimal packageTotalScore = new BigDecimal(ObjectUtil.isEmpty(packageTotalScoreDic) ? "21000" : packageTotalScoreDic.getValue()).setScale(2, BigDecimal.ROUND_DOWN);
+            //更新USDT底池
+            DataDictionaryCustom packagePoorDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+                    DataDictionaryEnum.PACKAGE_POOR.getType(),
+                    DataDictionaryEnum.PACKAGE_POOR.getCode()
+            );
+            BigDecimal packagePoor = new BigDecimal(ObjectUtil.isEmpty(packagePoorDic) ? "0" : packagePoorDic.getValue()).setScale(2, BigDecimal.ROUND_DOWN);
+            BigDecimal avaPackagePoor = packagePoor.add(addPoor);
+            packagePoorDic.setValue(avaPackagePoor.toString());
+            dataDictionaryCustomMapper.updateById(packagePoorDic);
+            //计算当前价格
+            BigDecimal divide = avaPackagePoor.divide(packageTotalScore, 8, BigDecimal.ROUND_DOWN);
+            packageScorePriceDic.setValue(divide.toString());
+            dataDictionaryCustomMapper.updateById(packageScorePriceDic);
 
-        DappUsdtPerkEntity dappUsdtPerkEntity = dappUsdtPerkEntityMapper.selectByMemberId(dappMemberEntity.getId());
-        BigDecimal availableAmount = dappUsdtPerkEntity.getAusdAmount();
-        if(availableAmount.compareTo(coinCnt) < 0){
-            throw new FebsException("数量不足");
-        }
-        dappUsdtPerkEntity.setAusdAmount(availableAmount.subtract(coinCnt));
-        dappUsdtPerkEntityMapper.updateById(dappUsdtPerkEntity);
-        //插入资产闪对的流水
-        DappFundFlowEntity aCoinCntFlow = new DappFundFlowEntity(
-                dappMemberEntity.getId(),
-                coinCnt.negate(),
-                FundFlowEnum.AUSDT_MEMBER_TO_MENBER.getCode(),
-                2,
-                BigDecimal.ZERO,
-                dappMemberEntity.getAddress(),
-                memberParent.getAddress(),
-                memberParent.getId());
-        dappFundFlowDao.insert(aCoinCntFlow);
 
-        DappUsdtPerkEntity parentEntity = dappUsdtPerkEntityMapper.selectByMemberId(memberParent.getId());
-        if(ObjectUtil.isEmpty(parentEntity)){
-            parentEntity = new DappUsdtPerkEntity();
-            parentEntity.setMemberId(memberParent.getId());
-            dappUsdtPerkEntityMapper.insert(parentEntity);
+            DappFundFlowEntity packageFlow = new DappFundFlowEntity(
+                    AccountFlowEnum.SYSTEM_PACKAGE.getCode(),
+                    1L,
+                    addPoor,
+                    FundFlowEnum.SYSTEM_WITHDRAW_PACKAGE.getCode(),
+                    2,
+                    BigDecimal.ZERO,
+                    null,
+                    memberCoinWithdrawEntity.getId());
+            dappFundFlowDao.insert(packageFlow);
+
+            DappAKlineEntity dappAKlineEntity = new DappAKlineEntity();
+            dappAKlineEntity.setOpenPrice(divide);
+            dappAKlineEntity.setType(1);
+            dappAKlineMapper.insert(dappAKlineEntity);
         }
-        BigDecimal availableAmountParent = ObjectUtil.isEmpty(parentEntity.getAusdAmount()) ? BigDecimal.ZERO : parentEntity.getAusdAmount();
-        parentEntity.setAusdAmount(availableAmountParent.add(coinCnt));
-        dappUsdtPerkEntityMapper.updateById(parentEntity);
-        //插入资产闪对的流水
-        DappFundFlowEntity aCoinCntFlowParent = new DappFundFlowEntity(
-                memberParent.getId(),
-                coinCnt,
-                FundFlowEnum.AUSDT_MEMBER_TO_MENBER.getCode(),
-                2,
-                BigDecimal.ZERO,
-                dappMemberEntity.getAddress(),
-                memberParent.getAddress(),
-                dappMemberEntity.getId());
-        dappFundFlowDao.insert(aCoinCntFlowParent);
+        return new FebsResponse().success();
+    }
+
+    @Override
+    public FebsResponse withdrawDisAgree(Long id) {
+        DappFundFlowEntity dappFundFlowEntity = dappFundFlowDao.selectById(id);
+
+        if(FundFlowEnum.WITHDRAW_USDT.getCode() != dappFundFlowEntity.getType()){
+            return new FebsResponse().fail().message("该记录不存在");
+        }
+        if(DappFundFlowEntity.WITHDRAW_STATUS_ING != dappFundFlowEntity.getStatus()){
+            return new FebsResponse().fail().message("提现记录不是进行中状态");
+        }
+        DappMemberEntity dappMemberEntity = dappMemberDao.selectById(dappFundFlowEntity.getMemberId());
+        if(ObjectUtil.isEmpty(dappMemberEntity)) {
+            return new FebsResponse().fail().message("会员信息不存在");
+        }
+        MemberCoinWithdrawEntity memberCoinWithdrawEntity = memberCoinWithdrawDao.selectByFlowId(dappMemberEntity.getId(),dappFundFlowEntity.getId());
+        if(ObjectUtil.isEmpty(memberCoinWithdrawEntity)){
+            return new FebsResponse().fail().message("该记录不存在");
+        }
+        if(MemberCoinWithdrawEntity.STATUS_DOING != memberCoinWithdrawEntity.getStatus()){
+            return new FebsResponse().fail().message("提现记录不是进行中状态");
+        }
+        dappFundFlowEntity.setStatus(DappFundFlowEntity.WITHDRAW_STATUS_DISAGREE);
+        dappFundFlowDao.updateById(dappFundFlowEntity);
+
+        memberCoinWithdrawEntity.setStatus(MemberCoinWithdrawEntity.STATUS_NO);
+        memberCoinWithdrawEntity.setIsInside(MemberCoinWithdrawEntity.ISINSIDE_NO);
+        memberCoinWithdrawDao.updateById(memberCoinWithdrawEntity);
+        //增加余额
+        BigDecimal negate = dappFundFlowEntity.getAmount().negate().multiply(new BigDecimal(7));
+        this.updateWalletCoinWithLock(negate, dappMemberEntity.getId(), 1);
+        return new FebsResponse().success();
+    }
+
+    @Override
+    public FebsResponse getChangeInPageInPage(ChangeInPageDto changeInPageDto) {
+        DappMemberEntity member = LoginUserUtil.getAppUser();
+        Long memberId = member.getId();
+        changeInPageDto.setMemberId(memberId);
+        Page<DappAccountMoneyChangeEntity> page = new Page<>(changeInPageDto.getPageNum(), changeInPageDto.getPageSize());
+        IPage<DappAccountMoneyChangeEntity> memberMoneyFlowVos = dappAccountMoneyChangeDao.getChangeInPageInPage(page,changeInPageDto);
+        return new FebsResponse().success().data(memberMoneyFlowVos);
+    }
+
+    @Override
+    public FebsResponse changeInToday() {
+        DappMemberEntity member = LoginUserUtil.getAppUser();
+        Long memberId = member.getId();
+        DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = dappAccountMoneyChangeDao.selectNewOneByMemberId(memberId);
+        return new FebsResponse().success().data(dappAccountMoneyChangeEntity);
+    }
+
+    @Override
+    public CashOutSettingVo cashOutSetting() {
+        CashOutSettingVo cashOutSettingVo = new CashOutSettingVo();
+        //最小提现金额
+        DataDictionaryCustom minWithdrawDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+                DataDictionaryEnum.MIN_WITHDRAW_AMOUNT.getType(),
+                DataDictionaryEnum.MIN_WITHDRAW_AMOUNT.getCode()
+        );
+        BigDecimal minWithdraw = new BigDecimal(minWithdrawDic.getValue()).setScale(2,BigDecimal.ROUND_DOWN);
+
+        cashOutSettingVo.setMinWithdraw(minWithdraw);
+        //今日最大提现金额
+        DataDictionaryCustom maxWithdrawDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+                DataDictionaryEnum.MAX_WITHDRAW_AMOUNT.getType(),
+                DataDictionaryEnum.MAX_WITHDRAW_AMOUNT.getCode()
+        );
+        BigDecimal maxWithdraw = new BigDecimal(maxWithdrawDic.getValue()).setScale(2,BigDecimal.ROUND_DOWN);
+        cashOutSettingVo.setMaxWithdraw(maxWithdraw);
+        return cashOutSettingVo;
     }
 }

--
Gitblit v1.9.1