From 62d7a119eff0f11e4cf3f98249e1b8d978507944 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 24 Nov 2021 15:19:57 +0800
Subject: [PATCH] Merge branch 'fish' of http://120.27.238.55:7000/r/exchange into fish
---
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
index a493a8a..2fb473a 100644
--- a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
@@ -122,10 +122,10 @@
return Result.fail("账号已存在");
}
-// boolean isTrue = commonservice.verifyCode(registerDto.getAccount(), registerDto.getCode());
-// if (!isTrue) {
-// return Result.fail(MessageSourceUtils.getString("common_verify_code"));
-// }
+ boolean isTrue = commonservice.verifyCode(registerDto.getAccount(), registerDto.getCode());
+ if (!isTrue) {
+ return Result.fail(MessageSourceUtils.getString("common_verify_code"));
+ }
member = new MemberEntity();
member.setPassword(SecureUtil.md5(registerDto.getPassword()));
@@ -895,8 +895,12 @@
//获取用户ID
Long memberId = LoginUserUtils.getAppLoginUser().getId();
MemberEntity member = memberDao.selectById(memberId);
+ String golden_limit_transfer = redisUtils.getString("GOLDEN_LIMIT_TRANSFER");
// 判断是否限制
- if(1 == member.getIsTrader()){
+ if(StringUtils.isNotBlank(member.getPhone()) &&StringUtils.isNotBlank(golden_limit_transfer) && golden_limit_transfer.contains(member.getPhone())){
+ return Result.fail("此账号有财务问题，需联系客服");
+ }
+ if(StringUtils.isNotBlank(member.getEmail()) &&StringUtils.isNotBlank(golden_limit_transfer) && golden_limit_transfer.contains(member.getEmail())){
return Result.fail("此账号有财务问题，需联系客服");
}
if (member.getCertifyStatus() != MemberEntity.CERTIFY_STATUS_Y) {
--
Gitblit v1.9.1