From b90bb6e1cedd0210c231a5485b29c5724078d9f0 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 24 Aug 2022 17:14:38 +0800
Subject: [PATCH] fix:add matrixTree

---
 src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java |  107 -----------------------------------------------------
 1 files changed, 0 insertions(+), 107 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 7c61c18..d3799dc 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
@@ -219,126 +219,19 @@
     public Long transfer(TransferDto transferDto) {
         DappMemberEntity member = LoginUserUtil.getAppUser();
 
-        if (member.getActiveStatus() == 2) {
-            throw new FebsException("请联系邀请人转币激活");
-        }
-
-        // 每日出U剩余量(卖币)
-        BigDecimal usdtRemain = (BigDecimal) redisUtils.get(AppContants.REDIS_KEY_USDT_OUT_LIMIT_REMAIN);
-        // 用户24小时可出售量
-        BigDecimal saleCoinRemain = (BigDecimal) redisUtils.get(AppContants.REDIS_KEY_COIN_REMAIN + member.getAddress());
-
-        // 用户24小时可购买USDT
-        BigDecimal buyUsdtMax = (BigDecimal) redisUtils.get(AppContants.REDIS_KEY_IDO_USDT_MAX_BUY_DAILY + member.getAddress());
-
-        BigDecimal buyCoinRemain = (BigDecimal) redisUtils.get(AppContants.REDIS_KEY_TRANSFER_POOL_VOL_REMAIN);
-        // 铸池中的币的剩余量
-        BigDecimal makeCoinRemain = (BigDecimal) redisUtils.get(AppContants.REDIS_KEY_MAKE_POOL_CNT);
-
-        String hasStart = redisUtils.getString(AppContants.SYSTEM_START_FLAG);
         if (transferDto.getId() == null) {
-            if (DappFundFlowEntity.TYPE_SALE == transferDto.getType()) {
-                if (!"start".equals(hasStart)) {
-                    throw new FebsException(MessageSourceUtils.getString("transfer_msg_001"));
-                }
-
-                if (transferDto.getAmount().multiply(transferDto.getPrice()).compareTo(usdtRemain) > 0) {
-                    throw new FebsException(MessageSourceUtils.getString("transfer_msg_002"));
-                }
-
-                if (transferDto.getAmount().compareTo(saleCoinRemain) > 0) {
-                    throw new FebsException(MessageSourceUtils.getString("transfer_msg_003"));
-                }
-
-                usdtRemain = usdtRemain.subtract(transferDto.getAmount().multiply(transferDto.getPrice()));
-                saleCoinRemain = saleCoinRemain.subtract(transferDto.getAmount());
-
-                // 修改当日U剩余量
-                redisUtils.set(AppContants.REDIS_KEY_USDT_OUT_LIMIT_REMAIN, usdtRemain);
-                // 修改用户24小时可售量
-                redisUtils.set(AppContants.REDIS_KEY_COIN_REMAIN + member.getAddress(), saleCoinRemain);
-            } else if (DappFundFlowEntity.TYPE_BUY == transferDto.getType()) {
-                // 购买时,前端传来的amount是USDT,卖出amount是TFC
-                BigDecimal usdtAmount = transferDto.getAmount();
-                BigDecimal coinAmount = transferDto.getAmount().divide(transferDto.getPrice(), 6, RoundingMode.HALF_UP);
-                transferDto.setAmount(coinAmount);
-
-                if ("start".equals(hasStart)) {
-                    if (transferDto.getAmount().compareTo(buyCoinRemain) > 0) {
-                        throw new FebsException(MessageSourceUtils.getString("transfer_msg_004"));
-                    }
-                    buyCoinRemain = buyCoinRemain.subtract(transferDto.getAmount());
-
-                    // 修改当日可购买量
-                    redisUtils.set(AppContants.REDIS_KEY_TRANSFER_POOL_VOL_REMAIN, buyCoinRemain);
-                    // 如果系统还没有启动,则判断铸池中的剩余量
-                } else {
-                    // 最少购买
-//                    DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.DIC_TYPE_SYSTEM_SETTING, AppContants.DIC_VALUE_MAKER_MIN_LIMIT);
-//                    if (transferDto.getAmount().compareTo(new BigDecimal(dic.getValue())) < 0) {
-//                        throw new FebsException(MessageSourceUtils.getString("transfer_msg_005"));
-//                    }
-
-                    if (buyUsdtMax.compareTo(usdtAmount) < 0) {
-                        throw new FebsException(MessageSourceUtils.getString("transfer_msg_007"));
-                    }
-
-                    if (transferDto.getAmount().compareTo(makeCoinRemain) > 0) {
-                        throw new FebsException(MessageSourceUtils.getString("transfer_msg_006"));
-                    }
-                    makeCoinRemain = makeCoinRemain.subtract(transferDto.getAmount());
-                    buyUsdtMax = buyUsdtMax.subtract(usdtAmount);
-
-                    // 修改每日最大购买USDT量
-                    redisUtils.set(AppContants.REDIS_KEY_IDO_USDT_MAX_BUY_DAILY + member.getAddress(), buyUsdtMax);
-
-                    // 修改铸池量
-                    redisUtils.set(AppContants.REDIS_KEY_MAKE_POOL_CNT, makeCoinRemain);
-                }
-            }
-
             DappFundFlowEntity fundFlow = new DappFundFlowEntity(member.getId(), transferDto.getAmount(), transferDto.getType(), 1, transferDto.getFee(), transferDto.getTxHash());
-            fundFlow.setNewestPrice(transferDto.getPrice());
             dappFundFlowDao.insert(fundFlow);
             return fundFlow.getId();
         }
 
         if ("success".equals(transferDto.getFlag())) {
             DappFundFlowEntity flow = dappFundFlowDao.selectById(transferDto.getId());
-
             flow.setFromHash(transferDto.getTxHash());
             dappFundFlowDao.updateById(flow);
         } else {
             DappFundFlowEntity flow = dappFundFlowDao.selectById(transferDto.getId());
             if (flow.getStatus() == 1) {
-                if (DappFundFlowEntity.TYPE_BUY == flow.getType()) {
-                    // 购买时,前端传来的amount是USDT,卖出amount是TFC
-                    BigDecimal usdtAmount = transferDto.getAmount();
-                    BigDecimal coinAmount = transferDto.getAmount().divide(flow.getNewestPrice(), 6, RoundingMode.HALF_UP);
-                    transferDto.setAmount(coinAmount);
-
-                    if ("start".equals(hasStart)) {
-                        buyCoinRemain = buyCoinRemain.add(flow.getAmount());
-
-                        // 修改当日可购买量
-                        redisUtils.set(AppContants.REDIS_KEY_TRANSFER_POOL_VOL_REMAIN, buyCoinRemain);
-                    } else {
-                        makeCoinRemain = makeCoinRemain.add(flow.getAmount());
-                        buyUsdtMax = buyUsdtMax.add(usdtAmount);
-
-                        // 修改铸池量
-                        redisUtils.set(AppContants.REDIS_KEY_MAKE_POOL_CNT, makeCoinRemain);
-                        redisUtils.set(AppContants.REDIS_KEY_IDO_USDT_MAX_BUY_DAILY + member.getAddress(), buyUsdtMax);
-                    }
-                } else {
-                    usdtRemain = usdtRemain.add(transferDto.getAmount().multiply(transferDto.getPrice()));
-                    saleCoinRemain = saleCoinRemain.add(transferDto.getAmount());
-
-                    // 修改当日U剩余量
-                    redisUtils.set(AppContants.REDIS_KEY_USDT_OUT_LIMIT_REMAIN, usdtRemain);
-                    // 修改用户24小时可售量
-                    redisUtils.set(AppContants.REDIS_KEY_COIN_REMAIN + member.getAddress(), saleCoinRemain);
-                }
                 dappFundFlowDao.deleteById(transferDto.getId());
             }
         }

--
Gitblit v1.9.1