From ad3e1aee8d80d7534ad777a16255fed922fc5dde Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 05 Jun 2023 14:39:39 +0800
Subject: [PATCH] twoCoin项目修改

---
 src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java |   31 +++++++++++++++++++++++++++----
 1 files changed, 27 insertions(+), 4 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 79fb9e8..fb2fe6e 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
@@ -704,9 +704,27 @@
                 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");
+
+//                BigDecimal amountInLast = dappChargeUsdtMapper.selectByMaxAmountMemberId(member.getId());
+                /**
+                 * 限制用户买入总额,
+                 *  目前每人限一单,总金额限制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(!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");
+                    }
                 }
                 /**
                  * 验证账户是否有入金金额的10%的AUSD
@@ -1123,7 +1141,12 @@
         dappFundFlowDao.insert(aCoinCntFlow);
 
         DappUsdtPerkEntity parentEntity = dappUsdtPerkEntityMapper.selectByMemberId(memberParent.getId());
-        BigDecimal availableAmountParent = parentEntity.getAusdAmount();
+        if(ObjectUtil.isEmpty(parentEntity)){
+            parentEntity = new DappUsdtPerkEntity();
+            parentEntity.setMemberId(memberParent.getId());
+            dappUsdtPerkEntityMapper.insert(parentEntity);
+        }
+        BigDecimal availableAmountParent = ObjectUtil.isEmpty(parentEntity.getAusdAmount()) ? BigDecimal.ZERO : parentEntity.getAusdAmount();
         parentEntity.setAusdAmount(availableAmountParent.add(coinCnt));
         dappUsdtPerkEntityMapper.updateById(parentEntity);
         //插入资产闪对的流水

--
Gitblit v1.9.1