From 8d053c03d0738efabc33183c1db20e05ced5cfb0 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 25 Nov 2021 16:01:23 +0800
Subject: [PATCH] fix
---
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 48 ++++++++++++++++++++++++++++++++----------------
1 files changed, 32 insertions(+), 16 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..01561d2 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
@@ -15,6 +15,8 @@
import com.xcong.excoin.common.system.service.CommonService;
import com.xcong.excoin.modules.coin.dao.MemberAccountMoneyChangeDao;
import com.xcong.excoin.modules.coin.entity.MemberAccountMoneyChange;
+import com.xcong.excoin.modules.fish.dao.MemberAccountGoldDao;
+import com.xcong.excoin.modules.fish.entity.MemberAccountGold;
import com.xcong.excoin.modules.member.dao.*;
import com.xcong.excoin.modules.member.entity.*;
import com.xcong.excoin.modules.member.parameter.dto.MemberAddCoinAddressDto;
@@ -85,6 +87,9 @@
MemberAuthenticationDao memberAuthenticationDao;
@Resource
+ MemberAccountGoldDao memberAccountGoldDao;
+
+ @Resource
RedisUtils redisUtils;
@Resource
@@ -122,10 +127,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()));
@@ -186,6 +191,13 @@
}
member.setRefererIds(ids);
memberDao.updateById(member);
+
+ MemberAccountGold memberAccountGoldNew = new MemberAccountGold();
+ memberAccountGoldNew.setMemberId(member.getId());
+ memberAccountGoldNew.setTotalBalance(BigDecimal.ZERO);
+ memberAccountGoldNew.setAvailableBalance(BigDecimal.ZERO);
+ memberAccountGoldNew.setFrozenBalance(BigDecimal.ZERO);
+ memberAccountGoldDao.insert(memberAccountGoldNew);
//初始化合约钱包
MemberWalletContractEntity walletContract = new MemberWalletContractEntity();
@@ -599,13 +611,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 +643,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<>();
@@ -895,8 +907,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