From 428fcf8bc1dfe7785634eee4f951fa856006cfe8 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 05 Jun 2023 11:28:57 +0800
Subject: [PATCH] twoCoin项目修改
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 174 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 161 insertions(+), 13 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 5e52838..3933b18 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,16 @@
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);
+ BigDecimal realUsdtAmountFee = realUsdtAmount.multiply(outPercent).setScale(4,BigDecimal.ROUND_DOWN);
+ realUsdtAmount = realUsdtAmount.subtract(realUsdtAmountFee);
//减少闪对钱包的币的数量
this.updateWalletCoinWithLock(amount, member.getId(), 2);
//增加流水
@@ -429,11 +436,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(
@@ -454,7 +456,7 @@
coinACntDic.setValue(coinACnt.toString());
dataDictionaryCustomMapper.updateById(coinACntDic);
- coinAPrice = coinAUsdtCnt.divide(coinACnt,8,BigDecimal.ROUND_DOWN);
+ coinAPrice = coinAUsdtCnt.divide(coinACnt,12,BigDecimal.ROUND_DOWN);
aCoinPriceDic.setValue(coinAPrice.toString());
dataDictionaryCustomMapper.updateById(aCoinPriceDic);
@@ -622,6 +624,14 @@
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("功能升级中");
@@ -678,6 +688,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());
@@ -701,10 +723,10 @@
BigDecimal ausdPrice = new BigDecimal(ausdPriceDic.getValue());
BigDecimal ausdAmountNeed = ausdPercentUsdt.divide(ausdPrice);
if(BigDecimal.ZERO.compareTo(ausdAmount) >= 0){
- throw new FebsException("AUSD数量不足");
+ throw new FebsException("AUSDT数量不足");
}
if(ausdAmountNeed.compareTo(ausdAmount) > 0){
- throw new FebsException("AUSD数量不足");
+ throw new FebsException("AUSDT数量不足");
}
/**
* 出局复投要求等于戓大于自己上次投资金额
@@ -760,7 +782,6 @@
flow.setFromHash(transferADto.getTxHash());
flow.setStatus(DappFundFlowEntity.WITHDRAW_STATUS_AGREE);
dappFundFlowDao.updateById(flow);
- dappMemberDao.updateMemberActiveStatus(1,member.getId());
/**
* 发送消息处理返利逻辑
*/
@@ -840,13 +861,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
@@ -978,4 +999,131 @@
IPage<DappFundFlowVo> records = dappFundFlowDao.selectVoInPage(page, dappFundFlowEntity);
return records.getRecords();
}
+
+ @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);
+ 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);
+ //闪对钱包获取的
+ 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);
+ dappFundFlowDao.insert(dappFundFlowEntity);
+
+ //金本位底池数量
+ 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());
+
+ 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("输入正确的数量");
+ }
+
+ 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);
+ dappFundFlowDao.insert(aCoinCntFlow);
+
+ DappUsdtPerkEntity parentEntity = dappUsdtPerkEntityMapper.selectByMemberId(memberParent.getId());
+ BigDecimal availableAmountParent = 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);
+ dappFundFlowDao.insert(aCoinCntFlowParent);
+ }
}
--
Gitblit v1.9.1