From f922185560da4b4001268d5a32ae6319e21a903f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sun, 04 Jun 2023 22:44:36 +0800
Subject: [PATCH] twoCoin项目修改
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 38 ++++++++++++++++++++++----------------
1 files changed, 22 insertions(+), 16 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 5115526..fff3bf3 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
@@ -402,9 +402,15 @@
BigDecimal feePercent = new BigDecimal(toUsdtPercentFeeDic.getValue());
//手续费扣除USDT
BigDecimal feeUsdtAmount = coinUsdtAmount.multiply(feePercent).setScale(4,BigDecimal.ROUND_DOWN);
- //实际提现USDT数量
- BigDecimal realUsdtAmount = coinUsdtAmount.subtract(feeUsdtAmount).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);
+ realUsdtAmount = realUsdtAmount.multiply(outPercent).setScale(4,BigDecimal.ROUND_DOWN);
//减少闪对钱包的币的数量
this.updateWalletCoinWithLock(amount, member.getId(), 2);
//增加流水
@@ -429,11 +435,6 @@
/**
* A币卖币规则，卖出100%销毁，30%回流底池溢价
*/
- DataDictionaryCustom outPercentDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
- PoolEnum.WALLET_COIN_OUT_PERCENT.getType(),
- PoolEnum.WALLET_COIN_OUT_PERCENT.getCode()
- );
- BigDecimal outPercent = new BigDecimal(outPercentDic.getValue());
coinUsdtAmount = coinUsdtAmount.multiply(outPercent).setScale(4,BigDecimal.ROUND_DOWN);
//金本位底池数量
DataDictionaryCustom coinAUsdtPriceDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
@@ -457,13 +458,6 @@
coinAPrice = coinAUsdtCnt.divide(coinACnt,12,BigDecimal.ROUND_DOWN);
aCoinPriceDic.setValue(coinAPrice.toString());
dataDictionaryCustomMapper.updateById(aCoinPriceDic);
-
- DappFundFlowEntity flowSubtract = new DappFundFlowEntity(1L,
- coinUsdtAmount,
- FundFlowEnum.WALLET_COIN_TO_USDT_W.getCode(),
- 2,
- BigDecimal.ZERO);
- dappFundFlowDao.insert(flowSubtract);
chainProducer.sendAntKLineMsg(0);
}
@@ -685,6 +679,18 @@
}
}
/**
+ * 入金限制
+ * 每人总共入金100U
+ */
+ BigDecimal amountIn = transferADto.getAmount();
+ if(amountIn.compareTo(new BigDecimal(100)) != 0){
+ throw new FebsException("Limit per address 100 USDT");
+ }
+ BigDecimal amountInLast = dappChargeUsdtMapper.selectByMaxAmountMemberId(member.getId());
+ if(BigDecimal.ZERO.compareTo(amountInLast) < 0){
+ throw new FebsException("Limit per address 100 USDT");
+ }
+ /**
* 验证账户是否有入金金额的10%的AUSD
*/
DappUsdtPerkEntity dappUsdtPerkEntity = dappUsdtPerkEntityMapper.selectByMemberId(member.getId());
@@ -846,13 +852,13 @@
dappFundFlowDao.insert(memberFeeflow);
//插入资产闪对手续费的流水
DappFundFlowEntity dappFundFlowEntityFee = new DappFundFlowEntity(
- 1L,
+ 295L,
feeCnt,
FundFlowEnum.WALLET_MINE_TO_COIN_FEE.getCode(),
2,
BigDecimal.ZERO);
dappFundFlowDao.insert(dappFundFlowEntityFee);
- this.updateWalletMineWithLock(feeCnt,1L,1);
+ this.updateWalletMineWithLock(feeCnt,295L,1);
}
@Override
--
Gitblit v1.9.1