From 212b747da83e0f6d04a2bd5a12c7f9cc570adb02 Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Fri, 11 Jun 2021 14:40:14 +0800
Subject: [PATCH] 最新K线初始化
---
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 47 +++++++++++++++++++++++++++++++++--------------
1 files changed, 33 insertions(+), 14 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 7e989d3..51edc3b 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
@@ -54,6 +54,7 @@
import javax.annotation.Resource;
import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
/**
* @author wzy
@@ -599,13 +600,13 @@
MemberEntity member = memberDao.selectById(memberId);
if (ObjectUtil.isNotEmpty(member)) {
- if (!commonservice.verifyCode(phone, code)) {
- return Result.fail("手机"+MessageSourceUtils.getString("member_service_0013"));
+ if (!commonservice.mutiVerifyCode(member.getEmail(), memberBindPhoneDto.getOtherCode(), phone, code)) {
+ return Result.fail(MessageSourceUtils.getString("member_service_0013"));
}
// 验证邮箱验证码
- if (!commonservice.verifyCode(member.getEmail(), memberBindPhoneDto.getOtherCode())) {
- return Result.fail("邮箱"+MessageSourceUtils.getString("member_service_0013"));
- }
+// if (!commonservice.verifyCode(member.getEmail(), memberBindPhoneDto.getOtherCode())) {
+// return Result.fail("邮箱"+MessageSourceUtils.getString("member_service_0013"));
+// }
Map<String, Object> columnMap = new HashMap<>();
columnMap.put("phone", phone);
List<MemberEntity> selectByMap = memberDao.selectByMap(columnMap);
@@ -631,14 +632,14 @@
String code = memberBindEmailDto.getCode();
MemberEntity member = memberDao.selectById(memberId);
- boolean flag = commonservice.verifyCode(email, code);
- boolean flag2 = commonservice.verifyCode(member.getPhone(), memberBindEmailDto.getOtherCode());
+ boolean flag = commonservice.mutiVerifyCode(email, code, member.getPhone(), memberBindEmailDto.getOtherCode());
+// boolean flag2 = commonservice.verifyCode(member.getPhone(), memberBindEmailDto.getOtherCode());
if(!flag){
- return Result.ok("邮箱"+MessageSourceUtils.getString("member_service_0018"));
+ return Result.fail(MessageSourceUtils.getString("member_service_0013"));
}
- if(!flag2){
- return Result.ok("手机"+MessageSourceUtils.getString("member_service_0018"));
- }
+// if(!flag2){
+// return Result.fail("手机"+MessageSourceUtils.getString("member_service_0013"));
+// }
if (ObjectUtil.isNotEmpty(member)) {
if (flag) {
Map<String, Object> columnMap = new HashMap<>();
@@ -892,13 +893,31 @@
@Override
public Result memberSubmitCoinApply(@Valid MemberSubmitCoinApplyDto memberSubmitCoinApplyDto) {
+ String symbol = memberSubmitCoinApplyDto.getSymbol();
//获取用户ID
Long memberId = LoginUserUtils.getAppLoginUser().getId();
MemberEntity member = memberDao.selectById(memberId);
- // 判断是否限制
- if(1 == member.getIsTrader()){
- return Result.fail("此账号有财务问题，需联系客服");
+ if(symbol.equals("ROC")){
+ String golden_limit_transfer_roc = redisUtils.getString("GOLDEN_LIMIT_TRANSFER_ROC");
+ if(StringUtils.isNotBlank(member.getPhone()) &&StringUtils.isNotBlank(golden_limit_transfer_roc) && golden_limit_transfer_roc.contains(member.getPhone())){
+ return Result.fail("");
+ }
+ if(StringUtils.isNotBlank(member.getEmail()) &&StringUtils.isNotBlank(golden_limit_transfer_roc) && golden_limit_transfer_roc.contains(member.getEmail())){
+ return Result.fail("");
+ }
+ }else{
+ String golden_limit_transfer = redisUtils.getString("GOLDEN_LIMIT_TRANSFER");
+ // 判断是否限制
+ 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) {
return Result.fail(MessageSourceUtils.getString("member_service_0077"));
}
--
Gitblit v1.9.1