From 0003d3f530a88399de016e62c31bcccf7d5d4592 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 03 Jul 2023 16:02:32 +0800
Subject: [PATCH] andao上联测试
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 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 a474f48..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,7 +446,7 @@
/**
* A币卖币规则，卖出100%销毁，30%回流底池溢价
*/
- BigDecimal coinUsdtAmountFee = 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(
@@ -641,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);
@@ -732,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));
@@ -753,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());
}
}
@@ -1123,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