From 46def5897de95d01c1606a49da4292f5f1e53760 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 12 Jun 2023 10:14:05 +0800
Subject: [PATCH] twoCoin项目修改
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 101 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 70 insertions(+), 31 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 cd02017..e4d20b4 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
@@ -36,6 +36,7 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import freemarker.template.utility.StringUtil;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -630,11 +631,15 @@
public static void main(String[] args) {
String ss = "0x2bBAD0d2362a8dbdc655fBa5A0cd51d5379e38f7,0xd5c13dc4372d1e02b93add9dcca901bef51168be,0xe22bb5fB2e0F8ED9366785dADD33cA19355d037c,0x7685E62E679886494E3cdc3DE7103E026f815AF0,0x6893bE8F4fb73595A13f32bA5e1d198Ab135516C";
- if(ss.contains("0xd5c13dc4372d1e02b93add9dcca901bef51168be")){
- System.out.println(1);
- }else{
- System.out.println(2);
- }
+// if(ss.contains("0xd5c13dc4372d1e02b93add9dcca901bef51168be")){
+// System.out.println(1);
+// }else{
+// System.out.println(2);
+// }
+// getLocalAddress("0x2bBAD0d2362a8dbdc655fBa5A0cd51d5379e38f7");
+ BigDecimal amountIn = BigDecimal.valueOf(951);
+ BigDecimal result = amountIn.divide(BigDecimal.valueOf(100));
+ System.out.println(result.remainder(BigDecimal.ONE).equals(BigDecimal.ZERO));
}
@Override
@@ -710,8 +715,22 @@
* 每人总共入金100U
*/
BigDecimal amountIn = transferADto.getAmount();
- if(amountIn.compareTo(new BigDecimal(100)) != 0){
- throw new FebsException("Limit per address 100 USDT");
+// if(amountIn.compareTo(new BigDecimal(100)) != 0){
+// throw new FebsException("Limit per address 100 USDT");
+// }
+ /**
+ * 每单金额得大于100 小于1000 限制
+ */
+ if(amountIn.compareTo(new BigDecimal(100)) < 0){
+ throw new FebsException("Min 100");
+ }
+ if(amountIn.compareTo(new BigDecimal(1000)) > 0){
+ throw new FebsException("Max 1000");
+ }
+
+ BigDecimal result = amountIn.divide(BigDecimal.valueOf(100));
+ if(!result.remainder(BigDecimal.ONE).equals(BigDecimal.ZERO)){
+ throw new FebsException("Please enter an integer multiple of 100");
}
// BigDecimal amountInLast = dappChargeUsdtMapper.selectByMaxAmountMemberId(member.getId());
@@ -719,30 +738,16 @@
* 限制用户买入总额，
* 目前每人限一单，总金额限制100U
*/
- BigDecimal amountInLast = dappChargeUsdtMapper.selectBySumAmountMemberId(member.getId());
- DataDictionaryCustom systemAddressDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
- PoolEnum.SYSTEM_ADDRESS.getType(),
- PoolEnum.SYSTEM_ADDRESS.getCode()
- );
- if(StrUtil.isNotEmpty(systemAddressDic.getValue())){
- if(!(dappMemberEntity.getAddress().equals("0x2bBAD0d2362a8dbdc655fBa5A0cd51d5379e38f7")
- ||dappMemberEntity.getAddress().equals("0xd5c13dc4372d1e02b93add9dcca901bef51168be")
- ||dappMemberEntity.getAddress().equals("0xe22bb5fB2e0F8ED9366785dADD33cA19355d037c")
- ||dappMemberEntity.getAddress().equals("0x7685E62E679886494E3cdc3DE7103E026f815AF0")
- ||dappMemberEntity.getAddress().equals("0x6893bE8F4fb73595A13f32bA5e1d198Ab135516C")
- )){
- if(BigDecimal.ZERO.compareTo(amountInLast) < 0){
- throw new FebsException("Limit per address 100 USDT");
- }
- }
-// if(!systemAddressDic.getValue().contains(dappMemberEntity.getAddress())){
-// if(BigDecimal.ZERO.compareTo(amountInLast) < 0){
-// throw new FebsException("Limit per address 100 USDT");
-// }
-// }
- }else{
- if(BigDecimal.ZERO.compareTo(amountInLast) < 0){
- throw new FebsException("Limit per address 100 USDT");
+// BigDecimal amountInLast = dappChargeUsdtMapper.selectBySumAmountMemberId(member.getId());
+ BigDecimal amountInLast = dappChargeUsdtMapper.selectBySumAmountMemberIdAndDate(member.getId(),DateUtil.today());
+ /**
+ * 每个地址只能使用一次 限制总额1000U
+ */
+ 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);
+ throw new FebsException("Max "+ add.toString());
}
}
/**
@@ -844,6 +849,29 @@
}
}
return null;
+ }
+
+ public boolean getLocalAddress(String address){
+ /**
+ * dappMemberEntity.getAddress().equals("0x2bBAD0d2362a8dbdc655fBa5A0cd51d5379e38f7")
+ * ||dappMemberEntity.getAddress().equals("0xd5c13dc4372d1e02b93add9dcca901bef51168be")
+ * ||dappMemberEntity.getAddress().equals("0xe22bb5fB2e0F8ED9366785dADD33cA19355d037c")
+ * ||dappMemberEntity.getAddress().equals("0x7685E62E679886494E3cdc3DE7103E026f815AF0")
+ * ||dappMemberEntity.getAddress().equals("0x6893bE8F4fb73595A13f32bA5e1d198Ab135516C"
+ */
+ if(address.equals("0x2bBAD0d2362a8dbdc655fBa5A0cd51d5379e38f7")){
+ return false;
+ }else if(address.equals("0xd5c13dc4372d1e02b93add9dcca901bef51168be")){
+ return false;
+ }else if(address.equals("0xe22bb5fB2e0F8ED9366785dADD33cA19355d037c")){
+ return false;
+ }else if(address.equals("0x7685E62E679886494E3cdc3DE7103E026f815AF0")){
+ return false;
+ }else if(address.equals("0x6893bE8F4fb73595A13f32bA5e1d198Ab135516C")){
+ return false;
+ }else{
+ return true;
+ }
}
@Override
@@ -1144,6 +1172,17 @@
throw new FebsException("请输入正确的地址");
}
+ /**
+ * 转ausdt，只能推广线上
+ */
+ String refererIdsDone = dappMemberEntity.getRefererIds();
+ String inviteIdDone = dappMemberEntity.getInviteId();
+ String refererIdsOther = memberParent.getRefererIds();
+ String inviteId1Other = memberParent.getInviteId();
+ if(!(StrUtil.contains(refererIdsOther,inviteIdDone) || StrUtil.contains(refererIdsDone,inviteId1Other))){
+ throw new FebsException("不满足互转规则");
+ }
+
BigDecimal coinCnt = roundCoinDto.getCoinCnt();
if(BigDecimal.ZERO.compareTo(coinCnt) >= 0){
throw new FebsException("输入正确的数量");
--
Gitblit v1.9.1