From d3744ab287cce63eabfb025f548c6e6164050c10 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 27 Jun 2023 11:18:32 +0800
Subject: [PATCH] 还有就是系统开放大额入单，不限制每一个帐号一千封顶。开放后每一个帐号最高入金十万美金。
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 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 997299e..70cf983 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
@@ -446,14 +446,15 @@
/**
* A币卖币规则，卖出100%销毁，30%回流底池溢价
*/
- coinUsdtAmount = coinUsdtAmount.multiply(outPercent).setScale(4,BigDecimal.ROUND_DOWN);
+ BigDecimal coinUsdtAmountFee = coinUsdtAmount.multiply(new BigDecimal(0.2)).setScale(4,BigDecimal.ROUND_DOWN);
+// coinUsdtAmount = coinUsdtAmount.multiply(outPercent).setScale(4,BigDecimal.ROUND_DOWN);
//金本位底池数量
DataDictionaryCustom coinAUsdtPriceDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
PoolEnum.COIN_A_USDT_PRICE.getType(),
PoolEnum.COIN_A_USDT_PRICE.getCode()
);
BigDecimal coinAUsdtCnt = new BigDecimal(coinAUsdtPriceDic.getValue());
- coinAUsdtCnt = coinAUsdtCnt.add(coinUsdtAmount).setScale(4,BigDecimal.ROUND_DOWN);
+ coinAUsdtCnt = coinAUsdtCnt.subtract(coinUsdtAmount).add(coinUsdtAmountFee).setScale(4,BigDecimal.ROUND_DOWN);
coinAUsdtPriceDic.setValue(coinAUsdtCnt.toString());
dataDictionaryCustomMapper.updateById(coinAUsdtPriceDic);
//币本位底池数量
@@ -640,8 +641,8 @@
// BigDecimal amountIn = BigDecimal.valueOf(951);
// BigDecimal result = amountIn.divide(BigDecimal.valueOf(100));
// System.out.println(result.remainder(BigDecimal.ONE).equals(BigDecimal.ZERO));
- Long memberId = 294L;
- if(294L == memberId){
+ Long memberId = 3067L;
+ if(AppContants.YL_MEMBER_ID.equals(memberId)){
System.out.println(1);
}else{
System.out.println(2);
@@ -731,8 +732,8 @@
if(amountIn.compareTo(new BigDecimal(100)) < 0){
throw new FebsException("Min 100");
}
- if(amountIn.compareTo(new BigDecimal(1000)) > 0){
- throw new FebsException("Max 1000");
+ if(amountIn.compareTo(new BigDecimal(100000)) > 0){
+ throw new FebsException("Max 100000");
}
BigDecimal result = amountIn.divide(BigDecimal.valueOf(100));
@@ -752,8 +753,8 @@
*/
BigDecimal amountInAll = amountInLast.add(amountIn);
if(getLocalAddress(dappMemberEntity.getAddress())){
- if(amountInAll.compareTo(new BigDecimal(1000)) > 0){
- BigDecimal add = new BigDecimal(1000).subtract(amountInLast).setScale(0, BigDecimal.ROUND_DOWN);
+ if(amountInAll.compareTo(new BigDecimal(100000)) > 0){
+ BigDecimal add = new BigDecimal(100000).subtract(amountInLast).setScale(0, BigDecimal.ROUND_DOWN);
throw new FebsException("Max "+ add.toString());
}
}
@@ -1122,7 +1123,8 @@
BigDecimal feePercent = new BigDecimal(StrUtil.isEmpty(dic.getValue()) ? "0.2" : dic.getValue());
//手续费
BigDecimal feeCnt = coinCnt.multiply(feePercent).setScale(4,BigDecimal.ROUND_DOWN);
- if(294L == member.getId()){
+ if(AppContants.YL_MEMBER_ID.equals(member.getId())
+ || AppContants.YL_MEMBER_ID_TWO.equals(member.getId())){
feeCnt = BigDecimal.ZERO;
}
//闪对钱包获取的
--
Gitblit v1.9.1