From 0b2666399f63211e60bca3897222961de82db4dd Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 02 Nov 2022 15:55:23 +0800
Subject: [PATCH] 20221021

---
 src/main/resources/i18n/message_zh_CN.properties                          |    1 +
 src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java |   11 +++++++++++
 src/main/resources/i18n/message_en_US.properties                          |    1 +
 3 files changed, 13 insertions(+), 0 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 e843221..845f324 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
@@ -540,6 +540,11 @@
 
         DappMemberEntity dappMemberEntityOut = LoginUserUtil.getAppUser();
         Long memberIdOut = dappMemberEntityOut.getId();
+        //判断账户是否限制
+        Integer withdrawAble = dappMemberEntityOut.getWithdrawAble();
+        if(2 == withdrawAble){
+            return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_0017"));
+        }
         //判断双方是否是会员
         if(ObjectUtil.isEmpty(dappMemberEntityOut.getInviteId())){
             return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_002"));
@@ -682,6 +687,12 @@
             return new FebsResponse().fail().message(MessageSourceUtils.getString("balance_err_002"));
         }
 
+        DappMemberEntity dappMemberEntityOut = dappMemberDao.selectById(memberId);
+        //判断账户是否限制
+        Integer withdrawAble = dappMemberEntityOut.getWithdrawAble();
+        if(2 == withdrawAble){
+            return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_0017"));
+        }
         //验证资金密码
         Boolean aBoolean = dappMemberService.validateTransferCode(apiTransferOutsideDto.getTransferCode(), memberId);
         if(!aBoolean){
diff --git a/src/main/resources/i18n/message_en_US.properties b/src/main/resources/i18n/message_en_US.properties
index 1ad521f..81d424f 100644
--- a/src/main/resources/i18n/message_en_US.properties
+++ b/src/main/resources/i18n/message_en_US.properties
@@ -54,6 +54,7 @@
 member_err_0014=Withdrawal once a day
 member_err_0015=Not in the hang up period
 member_err_0016=The number of transfers exceeds the specified number
+member_err_0017=Account exception
 
 Operation_001=Operation succeeded
 Operation_002=Operation failed
\ No newline at end of file
diff --git a/src/main/resources/i18n/message_zh_CN.properties b/src/main/resources/i18n/message_zh_CN.properties
index c1cca50..de9ed9a 100644
--- a/src/main/resources/i18n/message_zh_CN.properties
+++ b/src/main/resources/i18n/message_zh_CN.properties
@@ -52,6 +52,7 @@
 member_err_0014=\u6BCF\u65E5\u63D0\u73B0\u4E00\u6B21
 member_err_0015=\u4E0D\u5728\u6302\u673A\u65F6\u95F4\u6BB5\u5185
 member_err_0016=\u8F6C\u8D26\u6B21\u6570\u8D85\u8FC7\u89C4\u5B9A\u6B21\u6570
+member_err_0017=\u8D26\u6237\u5F02\u5E38
 
 Operation_001=\u64CD\u4F5C\u6210\u529F
 Operation_002=\u64CD\u4F5C\u5931\u8D25

--
Gitblit v1.9.1