From ee6ca03643c26f58271275956c3d3dc755710824 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sun, 31 May 2020 15:17:21 +0800
Subject: [PATCH] 20200531 代码提交
---
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 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 8477168..07fca1a 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
@@ -33,12 +33,12 @@
import com.xcong.excoin.modules.member.parameter.vo.MemberPaymethodDetailVo;
import com.xcong.excoin.modules.member.service.MemberService;
import com.xcong.excoin.modules.platform.dao.PlatformSymbolsCoinDao;
+import com.xcong.excoin.modules.platform.entity.PlatformSymbolsCoinEntity;
import com.xcong.excoin.utils.MessageSourceUtils;
import com.xcong.excoin.utils.RedisUtils;
import com.xcong.excoin.utils.ShareCodeUtil;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -566,18 +566,13 @@
String code = memberBindEmailDto.getCode();
MemberEntity member = memberDao.selectById(memberId);
- String verifyCode = (String)redisUtils.get("EMAIL_" + email);
+ boolean flag = commonservice.verifyCode(email, code);
if (ObjectUtil.isNotEmpty(member)) {
- if (StringUtils.isBlank(verifyCode)) {
- return Result.fail(MessageSourceUtils.getString("member_service_0012"));
+ if (flag) {
+ member.setEmail(email);
+ memberDao.updateById(member);
+ return Result.ok(MessageSourceUtils.getString("member_service_0018"));
}
- if (!code.equals(verifyCode)) {
- return Result.fail(MessageSourceUtils.getString("member_service_0039"));
- }
- member.setEmail(email);
- memberDao.updateById(member);
- redisUtils.del("EMAIL_" + member.getPhone());
- return Result.ok(MessageSourceUtils.getString("member_service_0018"));
}
return Result.fail(MessageSourceUtils.getString("member_service_0019"));
}
@@ -635,12 +630,15 @@
Long symbolscoinId = memberAddCoinAddressDto. getSymbolscoinId();
String remark = memberAddCoinAddressDto.getRemark();
+ PlatformSymbolsCoinEntity platformSymbolsCoinEntity = platformSymbolsCoinDao.selectById(symbolscoinId);
+
MemberCoinAddressEntity memberCoinAddressEntity = new MemberCoinAddressEntity();
memberCoinAddressEntity.setAddress(address);
memberCoinAddressEntity.setMemberId(memberId);
memberCoinAddressEntity.setIsBiyict(isBiyict);
memberCoinAddressEntity.setSymbolscoinId(symbolscoinId);
memberCoinAddressEntity.setLabel(remark);
+ memberCoinAddressEntity.setSymbol(platformSymbolsCoinEntity.getName());
memberCoinAddressDao.insert(memberCoinAddressEntity);
--
Gitblit v1.9.1