From 2eebadc490b460a3e97666ce33d46397e3fdfdd2 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 07 Aug 2023 22:01:32 +0800
Subject: [PATCH] 数据修改
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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..bd183f2 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
@@ -364,6 +364,11 @@
* A币卖币规则，卖出100%销毁，30%回流底池溢价
*/
DappMemberEntity member = LoginUserUtil.getAppUser();
+ DappMemberEntity dappMemberEntity = dappMemberDao.selectById(member.getId());
+ Integer activeStatus = dappMemberEntity.getActiveStatus();
+ if(1 != activeStatus){
+ throw new FebsException("Not yet open");
+ }
DataDictionaryCustom systemStateDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
PoolEnum.SYSTEM.getType(),
@@ -446,7 +451,7 @@
/**
* A币卖币规则，卖出100%销毁，30%回流底池溢价
*/
- BigDecimal coinUsdtAmountFee = coinUsdtAmount.multiply(new BigDecimal(0.2)).setScale(4,BigDecimal.ROUND_DOWN);
+ BigDecimal coinUsdtAmountFee = coinUsdtAmount.multiply(new BigDecimal(0.05)).setScale(4,BigDecimal.ROUND_DOWN);
// coinUsdtAmount = coinUsdtAmount.multiply(outPercent).setScale(4,BigDecimal.ROUND_DOWN);
//金本位底池数量
DataDictionaryCustom coinAUsdtPriceDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
@@ -454,7 +459,8 @@
PoolEnum.COIN_A_USDT_PRICE.getCode()
);
BigDecimal coinAUsdtCnt = new BigDecimal(coinAUsdtPriceDic.getValue());
- coinAUsdtCnt = coinAUsdtCnt.subtract(coinUsdtAmount).add(coinUsdtAmountFee).setScale(4,BigDecimal.ROUND_DOWN);
+ coinAUsdtCnt = coinAUsdtCnt.subtract(coinUsdtAmount).setScale(4,BigDecimal.ROUND_DOWN);
+// coinAUsdtCnt = coinAUsdtCnt.subtract(coinUsdtAmount).add(coinUsdtAmountFee).setScale(4,BigDecimal.ROUND_DOWN);
coinAUsdtPriceDic.setValue(coinAUsdtCnt.toString());
dataDictionaryCustomMapper.updateById(coinAUsdtPriceDic);
//币本位底池数量
@@ -826,6 +832,8 @@
*/
flow.setFromHash(transferADto.getTxHash());
dappFundFlowDao.updateById(flow);
+ chainProducer.sendContractAnDao(flow.getId());
+
// /**
// * 生成会员入金买A币的记录
// */
@@ -1107,6 +1115,9 @@
if(ObjectUtil.isEmpty(memberParent)){
throw new FebsException("请输入正确的地址");
}
+ if(member.getAddress().equals(memberParent.getAddress())){
+ throw new FebsException("请输入正确的地址");
+ }
BigDecimal coinCnt = roundCoinDto.getCoinCnt();
if(BigDecimal.ZERO.compareTo(coinCnt) >= 0){
--
Gitblit v1.9.1