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

---
 src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java |    9 +++++++--
 src/main/resources/mapper/dapp/DappChargeUsdtMapper.xml                   |    6 ++++++
 src/main/java/cc/mrbird/febs/dapp/mapper/DappChargeUsdtMapper.java        |    1 +
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/dapp/mapper/DappChargeUsdtMapper.java b/src/main/java/cc/mrbird/febs/dapp/mapper/DappChargeUsdtMapper.java
index 4523baa..cfbf9e1 100644
--- a/src/main/java/cc/mrbird/febs/dapp/mapper/DappChargeUsdtMapper.java
+++ b/src/main/java/cc/mrbird/febs/dapp/mapper/DappChargeUsdtMapper.java
@@ -10,4 +10,5 @@
 
     BigDecimal selectByMaxAmountMemberId(@Param("memberId")Long id);
 
+    BigDecimal selectBySumAmountMemberId(@Param("memberId")Long id);
 }
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 ee92601..cb4b592 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
@@ -705,13 +705,18 @@
                     throw new FebsException("Limit per address 100 USDT");
                 }
 
-                BigDecimal amountInLast = dappChargeUsdtMapper.selectByMaxAmountMemberId(member.getId());
+//                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().equals(dappMemberEntity.getAddress())){
+                    if(!systemAddressDic.getValue().contains(dappMemberEntity.getAddress())){
                         if(BigDecimal.ZERO.compareTo(amountInLast) < 0){
                             throw new FebsException("Limit per address 100 USDT");
                         }
diff --git a/src/main/resources/mapper/dapp/DappChargeUsdtMapper.xml b/src/main/resources/mapper/dapp/DappChargeUsdtMapper.xml
index 55b4344..4eabecc 100644
--- a/src/main/resources/mapper/dapp/DappChargeUsdtMapper.xml
+++ b/src/main/resources/mapper/dapp/DappChargeUsdtMapper.xml
@@ -8,4 +8,10 @@
         where member_id = #{memberId}
     </select>
 
+    <select id="selectBySumAmountMemberId" resultType="java.math.BigDecimal">
+        select ifnull(sum(amount),0)
+        from dapp_charge_usdt
+        where member_id = #{memberId}
+    </select>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1