From 08d5c76dc776c64efeb2a7d8fa33f90ee5132bfe Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Sun, 04 Sep 2022 12:10:36 +0800 Subject: [PATCH] fix --- src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 406 +++++++++++++++++++++++++++++---------------------------- 1 files changed, 206 insertions(+), 200 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 a1abc90..9bf87e4 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,5 +1,6 @@ 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.QueryRequest; import cc.mrbird.febs.common.exception.FebsException; @@ -9,14 +10,22 @@ 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.RecordInPageDto; -import cc.mrbird.febs.dapp.dto.TransferDto; -import cc.mrbird.febs.dapp.dto.WalletOperateDto; +import cc.mrbird.febs.dapp.dto.*; import cc.mrbird.febs.dapp.entity.*; 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.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 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 lombok.RequiredArgsConstructor; @@ -26,9 +35,7 @@ import java.math.BigDecimal; import java.math.RoundingMode; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * @author @@ -45,91 +52,32 @@ private final DappFundFlowDao dappFundFlowDao; private final DappAccountMoneyChangeDao dappAccountMoneyChangeDao; private final RedisUtils redisUtils; + private final DataDictionaryCustomMapper dataDictionaryCustomMapper; + private final DappNftActivationDao dappNftActivationDao; + + private final ChainProducer chainProducer; + private final DappSystemDao dappSystemDao; @Override public WalletInfoVo walletInfo() { DappMemberEntity member = LoginUserUtil.getAppUser(); - Map<String, BigDecimal> map = dappFundFlowDao.selectAmountTotalByType(member.getId()); + DappMemberEntity memberInfo = dappMemberDao.selectById(member.getId()); WalletInfoVo walletInfo = new WalletInfoVo(); - List<DappMemberEntity> direct = dappMemberDao.selectChildMemberDirectOrNot(member.getInviteId(), 1); - List<DappMemberEntity> notDirect = dappMemberDao.selectChildMemberDirectOrNot(member.getInviteId(), 2); - BigDecimal childHoldAmount = dappMemberDao.selectChildHoldAmount(member.getInviteId()); - - walletInfo.setTotalChild(notDirect.size()); - walletInfo.setDirectCnt(direct.size()); - walletInfo.setTotalChildCoin(childHoldAmount); - walletInfo.setTeamReward(map.get("teamReward")); - walletInfo.setMiningAmount(map.get("mine")); - walletInfo.setInviteId(member.getInviteId()); - return walletInfo; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void change(WalletOperateDto walletOperateDto) { - DappMemberEntity member = LoginUserUtil.getAppUser(); - - BigDecimal ethUsdtPrice = (BigDecimal) redisUtils.get(AppContants.REDIS_KEY_ETH_NEW_PRICE); - + List<DappMemberEntity> direct = dappMemberDao.selectChildMemberDirectOrNot(member.getInviteId(), 1, null); + DappWalletCoinEntity walletCoin = dappWalletCoinDao.selectByMemberId(member.getId()); DappWalletMineEntity walletMine = dappWalletMineDao.selectByMemberId(member.getId()); - if (walletOperateDto.getAmount().compareTo(walletMine.getAvailableAmount()) > 0) { - throw new FebsException("可用金额不足"); - } - DappFundFlowEntity fund = new DappFundFlowEntity(member.getId(), walletOperateDto.getAmount(), AppContants.MONEY_TYPE_CHANGE, null, null); - dappFundFlowDao.insert(fund); - - BigDecimal preEthAmount = walletMine.getAvailableAmount(); - - // TODO 并发加悲观锁 - // 更新eth金额 - walletMine.setAvailableAmount(walletMine.getAvailableAmount().subtract(walletOperateDto.getAmount())); - dappWalletMineDao.updateById(walletMine); - - DappWalletCoinEntity walletCoin = dappWalletCoinDao.selectByMemberId(member.getId()); - BigDecimal preUsdtAmount = walletCoin.getAvailableAmount(); - - // 更新usdt金额 - BigDecimal usdt = walletOperateDto.getAmount().multiply(ethUsdtPrice); - walletCoin.setAvailableAmount(walletCoin.getAvailableAmount().add(usdt)); - walletCoin.setTotalAmount(walletCoin.getTotalAmount().add(usdt)); - dappWalletCoinDao.updateById(walletCoin); - - DappAccountMoneyChangeEntity ethChange = new DappAccountMoneyChangeEntity(member.getId(), preEthAmount, walletOperateDto.getAmount(), walletMine.getAvailableAmount(), "ETH兑换USDT-ETH, 兑换价格为:" + ethUsdtPrice, AppContants.MONEY_TYPE_CHANGE); - DappAccountMoneyChangeEntity usdtChange = new DappAccountMoneyChangeEntity(member.getId(), preUsdtAmount, usdt, walletCoin.getAvailableAmount(), "ETH兑换USDT-USDT, 兑换价格为:" + ethUsdtPrice, AppContants.MONEY_TYPE_CHANGE); - dappAccountMoneyChangeDao.insert(ethChange); - dappAccountMoneyChangeDao.insert(usdtChange); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void withdraw(WalletOperateDto walletOperateDto) { - DappMemberEntity member = LoginUserUtil.getAppUser(); - - List<DappFundFlowEntity> fundFlows = dappFundFlowDao.selectListForMemberAndDay(member.getId(), 2); - if (CollUtil.isNotEmpty(fundFlows)) { - throw new FebsException("一天只能提现一次"); - } - - DappWalletCoinEntity walletCoin = dappWalletCoinDao.selectByMemberId(member.getId()); - if (walletOperateDto.getAmount().compareTo(walletCoin.getAvailableAmount()) > 0) { - throw new FebsException("可用金额不足"); - } - - Integer fee = (Integer) redisUtils.get(AppContants.REDIS_KEY_CHANGE_FEE); - - //TODO 并发加悲观锁 - BigDecimal preAmount = walletCoin.getAvailableAmount(); - walletCoin.setAvailableAmount(walletCoin.getAvailableAmount().subtract(walletOperateDto.getAmount())); - walletCoin.setFrozenAmount(walletCoin.getFrozenAmount().add(walletOperateDto.getAmount())); - dappWalletCoinDao.updateById(walletCoin); - - DappFundFlowEntity fund = new DappFundFlowEntity(member.getId(), walletOperateDto.getAmount(), AppContants.MONEY_TYPE_WITHDRAWAL, 1, new BigDecimal(fee)); - dappFundFlowDao.insert(fund); - - DappAccountMoneyChangeEntity usdtChange = new DappAccountMoneyChangeEntity(member.getId(), preAmount, walletOperateDto.getAmount(), walletCoin.getAvailableAmount(), "USDT申请提现", AppContants.MONEY_TYPE_WITHDRAWAL); - dappAccountMoneyChangeDao.insert(usdtChange); + 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()); + return walletInfo; } @Override @@ -142,6 +90,8 @@ dappFundFlowEntity.setType(recordInPageDto.getType()); } dappFundFlowEntity.setMemberId(member.getId()); + dappFundFlowEntity.setStatus(2); + IPage<DappFundFlowEntity> records = dappFundFlowDao.selectInPage(page, dappFundFlowEntity); return records.getRecords(); } @@ -150,37 +100,6 @@ public IPage<DappFundFlowEntity> fundFlowInPage(DappFundFlowEntity dappFundFlowEntity, QueryRequest request) { Page<DappFundFlowEntity> page = new Page<>(request.getPageNum(), request.getPageSize()); return dappFundFlowDao.selectInPage(page, dappFundFlowEntity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void withdrawAgreeOrNot(Long id, int type) { - DappFundFlowEntity fundFlow = dappFundFlowDao.selectById(id); - if (fundFlow == null) { - throw new FebsException("数据不存在"); - } - - DappWalletCoinEntity walletCoin = dappWalletCoinDao.selectByMemberId(fundFlow.getMemberId()); - if (type == 1) { - walletCoin.setFrozenAmount(walletCoin.getFrozenAmount().subtract(fundFlow.getAmount())); - walletCoin.setTotalAmount(walletCoin.getTotalAmount().subtract(fundFlow.getAmount())); - fundFlow.setStatus(DappFundFlowEntity.WITHDRAW_STATUS_AGREE); - } else if (type == 2) { - BigDecimal preAmount = walletCoin.getAvailableAmount(); - - walletCoin.setFrozenAmount(walletCoin.getFrozenAmount().subtract(fundFlow.getAmount())); - walletCoin.setAvailableAmount(walletCoin.getAvailableAmount().add(fundFlow.getAmount())); - - DappAccountMoneyChangeEntity accountMoneyChange = new DappAccountMoneyChangeEntity(walletCoin.getMemberId(), preAmount, fundFlow.getAmount(), walletCoin.getAvailableAmount(), "提现申请被驳回", 2); - fundFlow.setStatus(DappFundFlowEntity.WITHDRAW_STATUS_DISAGREE); - - dappAccountMoneyChangeDao.insert(accountMoneyChange); - } else { - throw new FebsException("参数错误"); - } - - dappWalletCoinDao.updateById(walletCoin); - dappFundFlowDao.updateById(fundFlow); } @Override @@ -205,108 +124,195 @@ public Long transfer(TransferDto transferDto) { DappMemberEntity member = LoginUserUtil.getAppUser(); - if (member.getActiveStatus() == 2) { - throw new FebsException("请联系邀请人转币激活"); + if (transferDto.getType() != 2) { + member = dappMemberDao.selectById(member.getId()); + if (member.getActiveStatus() == 1) { + throw new FebsException("Do not repeat purchase"); + } } - // 每日出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()); - BigDecimal buyCoinRemain = (BigDecimal) redisUtils.get(AppContants.REDIS_KEY_TRANSFER_POOL_VOL_REMAIN); - // 铸池中的币的剩余量 - BigDecimal makeCoinRemain = (BigDecimal) redisUtils.get(AppContants.REDIS_KEY_MAKE_POOL_CNT); - - if (transferDto.getId() == null) { - String hasStart = redisUtils.getString(AppContants.SYSTEM_START_FLAG); - if (DappFundFlowEntity.TYPE_SALE == transferDto.getType()) { - if (!"start".equals(hasStart)) { - throw new FebsException("系统还未启动"); - } - - if (transferDto.getAmount().multiply(transferDto.getPrice()).compareTo(usdtRemain) > 0) { - throw new FebsException("超过当日出U剩余量"); - } - - if (transferDto.getAmount().compareTo(saleCoinRemain) > 0) { - throw new FebsException("超出24小时内可售量"); - } - - } else if (DappFundFlowEntity.TYPE_BUY == transferDto.getType()) { - if ("start".equals(hasStart)) { - if (transferDto.getAmount().compareTo(buyCoinRemain) > 0) { - throw new FebsException("超过当日可购买量"); - } - // 如果系统还没有启动,则判断铸池中的剩余量 - } else { - if (transferDto.getAmount().compareTo(makeCoinRemain) > 0) { - throw new FebsException("可购数量不足"); - } - } + if (transferDto.getBuyType() == 1) { + DappWalletCoinEntity walletCoin = dappWalletCoinDao.selectByMemberId(member.getId()); + if (transferDto.getAmount().compareTo(walletCoin.getAvailableAmount()) > 0) { + throw new FebsException("Balance Not Enough"); } - DappFundFlowEntity fundFlow = new DappFundFlowEntity(member.getId(), transferDto.getAmount(), transferDto.getType(), 1, transferDto.getFee(), transferDto.getTxHash()); - fundFlow.setNewestPrice(transferDto.getPrice()); + updateWalletCoinWithLock(transferDto.getAmount(), member.getId(), 2); + + DappFundFlowEntity fundFlow = new DappFundFlowEntity(member.getId(), transferDto.getAmount().negate(), 1, 2, transferDto.getFee(), transferDto.getTxHash()); dappFundFlowDao.insert(fundFlow); - return fundFlow.getId(); - } - if ("success".equals(transferDto.getFlag())) { - DappFundFlowEntity flow = dappFundFlowDao.selectById(transferDto.getId()); - - flow.setFromHash(transferDto.getTxHash()); - dappFundFlowDao.updateById(flow); - - if (DappFundFlowEntity.TYPE_SALE == transferDto.getType()) { - usdtRemain = usdtRemain.subtract(flow.getAmount().multiply(flow.getNewestPrice())); - saleCoinRemain = saleCoinRemain.subtract(flow.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()) { - buyCoinRemain = buyCoinRemain.subtract(flow.getAmount()); - - // 修改当日可购买量 - redisUtils.set(AppContants.REDIS_KEY_TRANSFER_POOL_VOL_REMAIN, buyCoinRemain); - } else { - - throw new FebsException("参数错误"); - } + chainProducer.sendAchieveTreeMsg(member.getId()); } else { - dappFundFlowDao.deleteById(transferDto.getId()); + int type = 1; + // 1-认购 2-充值tfc + if (transferDto.getType() == 2) { + type = 6; + } + if (transferDto.getId() == null) { + DappFundFlowEntity fundFlow = new DappFundFlowEntity(member.getId(), transferDto.getAmount(), type, 1, transferDto.getFee(), transferDto.getTxHash()); + 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) { + dappFundFlowDao.deleteById(transferDto.getId()); + } + } } return null; } @Override - public Map<String, BigDecimal> calPrice() { + public BigDecimal calPrice(PriceDto priceDto) { + String priceStr = redisUtils.getString(AppContants.REDIS_KEY_TFC_NEW_PRICE); + + BigDecimal amount = priceDto.getAmount(); + if (priceDto.getAmount() == null) { + amount = BigDecimal.ZERO; + } + return amount.multiply(new BigDecimal("0.1")).divide(new BigDecimal(priceStr), 2, RoundingMode.HALF_UP); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void withdraw(WithdrawDto withdrawDto) { DappMemberEntity member = LoginUserUtil.getAppUser(); - - String hasStart = redisUtils.getString(AppContants.SYSTEM_START_FLAG); - if (!"start".equals(hasStart)) { - HashMap<String, BigDecimal> map = new HashMap<>(); - map.put("x", new BigDecimal("0.073")); - map.put("y", new BigDecimal("100000")); - return map; + DappWalletCoinEntity walletCoin = dappWalletCoinDao.selectByMemberId(member.getId()); + if (walletCoin.getAvailableAmount().compareTo(withdrawDto.getAmount()) < 0) { + throw new FebsException("Balance Not Enough"); } - ContractChainService tfcInstance = ChainService.getInstance(ChainEnum.BSC_TFC.name()); - // u剩余数量 - BigDecimal sourceU = ChainService.getInstance(ChainEnum.BSC_USDT.name()).balanceOf(ChainEnum.BSC_USDT_SOURCE.getAddress()); - // 源池代币剩余数量 - BigDecimal sourceCoin = tfcInstance.balanceOf(ChainEnum.BSC_USDT_SOURCE.getAddress()); - // 用户代币剩余数量 - BigDecimal coin = tfcInstance.balanceOf(member.getAddress()); - BigDecimal x = sourceU.divide(sourceCoin, tfcInstance.decimals(), RoundingMode.HALF_UP); - BigDecimal y = sourceU.divide(sourceCoin.add(coin), tfcInstance.decimals(), RoundingMode.HALF_UP); + DappWalletMineEntity walletMine = dappWalletMineDao.selectByMemberId(member.getId()); + if (walletMine.getAvailableAmount().compareTo(withdrawDto.getFee()) < 0) { + throw new FebsException("TFC Not Enough"); + } - log.info("购买价格:{}, 出卖价格:{}", x, y); - HashMap<String, BigDecimal> map = new HashMap<>(); - map.put("x", x); - map.put("y", y); - return map; + updateWalletCoinWithLock(withdrawDto.getAmount(), member.getId(), 2); + updateWalletMineWithLock(withdrawDto.getFee(), member.getId(), 2); + + DappFundFlowEntity feeFlow = new DappFundFlowEntity(member.getId(), withdrawDto.getFee().negate(), 7, 2, null, null); + dappFundFlowDao.insert(feeFlow); + + DappFundFlowEntity fundFlow = new DappFundFlowEntity(member.getId(), withdrawDto.getAmount().negate(), 5, 2, withdrawDto.getFee(), null); + dappFundFlowDao.insert(fundFlow); + + String hash = ChainService.getInstance(ChainEnum.BSC_USDT.name()).transfer(member.getAddress(), withdrawDto.getAmount()); + fundFlow.setToHash(hash); + dappFundFlowDao.updateById(fundFlow); + + Map<String, Object> map = new HashMap<>(); + map.put("fee", withdrawDto.getFee()); + map.put("address", ChainEnum.BSC_TFC_FEE.getAddress()); + map.put("flow", feeFlow.getId()); + chainProducer.sendTfcFee(JSONObject.toJSONString(map)); + } + + @Override + public void updateWalletCoinWithLock(BigDecimal amount, Long memberId, int type) { + boolean isSuccess = false; + while(!isSuccess) { + DappWalletCoinEntity walletCoin = dappWalletCoinDao.selectByMemberId(memberId); + + // 加 + if (type == 1) { + walletCoin.setTotalAmount(walletCoin.getTotalAmount().add(amount)); + walletCoin.setAvailableAmount(walletCoin.getAvailableAmount().add(amount)); + // 减 + } else { + if (amount.compareTo(walletCoin.getAvailableAmount()) > 0) { + throw new FebsException("Balance Not Enough"); + } + walletCoin.setTotalAmount(walletCoin.getTotalAmount().subtract(amount)); + walletCoin.setAvailableAmount(walletCoin.getAvailableAmount().subtract(amount)); + } + + int i = dappWalletCoinDao.updateWithLock(walletCoin); + if (i > 0) { + isSuccess = true; + } + } + } + + @Override + public void updateWalletMineWithLock(BigDecimal amount, Long memberId, int type) { + boolean isSuccess = false; + while(!isSuccess) { + DappWalletMineEntity walletMine = dappWalletMineDao.selectByMemberId(memberId); + + if (type == 1) { + walletMine.setTotalAmount(walletMine.getTotalAmount().add(amount)); + walletMine.setAvailableAmount(walletMine.getAvailableAmount().add(amount)); + } else { + if (amount.compareTo(walletMine.getAvailableAmount()) > 0) { + throw new FebsException("TFC Not Enough"); + } + walletMine.setTotalAmount(walletMine.getTotalAmount().subtract(amount)); + walletMine.setAvailableAmount(walletMine.getAvailableAmount().subtract(amount)); + } + + int i = dappWalletMineDao.updateWithLock(walletMine); + if (i > 0) { + isSuccess = true; + } + } + } + + @Override + public void addFrozenAmountWithLock(BigDecimal amount, Long memberId) { + boolean isSuccess = false; + while(!isSuccess) { + DappWalletCoinEntity walletCoin = dappWalletCoinDao.selectByMemberId(memberId); + + walletCoin.setTotalAmount(walletCoin.getTotalAmount().add(amount)); + walletCoin.setFrozenAmount(walletCoin.getFrozenAmount().add(amount)); + + int i = dappWalletCoinDao.updateWithLock(walletCoin); + if (i > 0) { + isSuccess = true; + + DappFundFlowEntity frozenAmount = new DappFundFlowEntity(memberId, amount, 9, 2, null, null); + dappFundFlowDao.insert(frozenAmount); + } + } + } + + @Override + public void releaseFrozenAmountWithLock(Long memberId) { + boolean isSuccess = false; + while(!isSuccess) { + DappWalletCoinEntity walletCoin = dappWalletCoinDao.selectByMemberId(memberId); + + if (walletCoin.getFrozenAmount().compareTo(BigDecimal.ZERO) <= 0) { + return; + } + BigDecimal frozen = walletCoin.getFrozenAmount(); + + walletCoin.setAvailableAmount(walletCoin.getAvailableAmount().add(frozen)); + walletCoin.setFrozenAmount(walletCoin.getFrozenAmount().subtract(frozen)); + + int i = dappWalletCoinDao.updateWithLock(walletCoin); + if (i > 0) { + isSuccess = true; + + DappFundFlowEntity releaseFrozen = new DappFundFlowEntity(memberId, frozen, 10, 2, null, null); + dappFundFlowDao.insert(releaseFrozen); + + DappFundFlowEntity releaseFrozenNegate = new DappFundFlowEntity(memberId, frozen.negate(), 9, 2, null, null); + dappFundFlowDao.insert(releaseFrozenNegate); + } + } + } + + @Override + public DappWalletCoinEntity findByMemberId(Long memberId) { + return dappWalletCoinDao.selectByMemberId(memberId); } } -- Gitblit v1.9.1