From 77f844f85e90ee6ae98c5f9c3d24f31d541db2f9 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 01 Jul 2020 19:53:15 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin
---
src/main/resources/i18n/messages_zh_CN.properties | 3 ++-
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 32 +++++++++++++++++++++++---------
src/main/resources/i18n/messages_en_US.properties | 3 ++-
3 files changed, 27 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 89dc55e..97c1ad7 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
@@ -557,7 +557,7 @@
@Override
@Transactional
public Result memberBindPhone(@Valid MemberBindPhoneDto memberBindPhoneDto) {
- //获取用户ID
+ //获取用户ID
Long memberId = LoginUserUtils.getAppLoginUser().getId();
String phone = memberBindPhoneDto.getPhone();
String code = memberBindPhoneDto.getCode();
@@ -568,9 +568,16 @@
if (!commonservice.verifyCode(phone, code)) {
return Result.fail(MessageSourceUtils.getString("member_service_0013"));
}
- member.setPhone(phone);
- memberDao.updateById(member);
- return Result.ok(MessageSourceUtils.getString("member_service_0014"));
+ Map<String, Object> columnMap = new HashMap<>();
+ columnMap.put("phone", phone);
+ List<MemberEntity> selectByMap = memberDao.selectByMap(columnMap );
+ if(CollUtil.isEmpty(selectByMap)) {
+ member.setPhone(phone);
+ memberDao.updateById(member);
+ return Result.ok(MessageSourceUtils.getString("member_service_0014"));
+ }else {
+ return Result.fail(MessageSourceUtils.getString("member_service_1400"));
+ }
}
return Result.fail(MessageSourceUtils.getString("member_service_0015"));
@@ -580,7 +587,7 @@
@Transactional
public Result memberBindEmail(@Valid MemberBindEmailDto memberBindEmailDto) {
- //获取用户ID
+ //获取用户ID
Long memberId = LoginUserUtils.getAppLoginUser().getId();
String email = memberBindEmailDto.getEmail();
String code = memberBindEmailDto.getCode();
@@ -589,9 +596,16 @@
boolean flag = commonservice.verifyCode(email, code);
if (ObjectUtil.isNotEmpty(member)) {
if (flag) {
- member.setEmail(email);
- memberDao.updateById(member);
- return Result.ok(MessageSourceUtils.getString("member_service_0018"));
+ Map<String, Object> columnMap = new HashMap<>();
+ columnMap.put("email", email);
+ List<MemberEntity> selectByMap = memberDao.selectByMap(columnMap );
+ if(CollUtil.isEmpty(selectByMap)) {
+ member.setEmail(email);
+ memberDao.updateById(member);
+ return Result.ok(MessageSourceUtils.getString("member_service_0018"));
+ }else {
+ return Result.fail(MessageSourceUtils.getString("member_service_1400"));
+ }
}
}
return Result.fail(MessageSourceUtils.getString("member_service_0019"));
@@ -879,7 +893,7 @@
*/
return Result.ok(MessageSourceUtils.getString("member_service_0086"));
} else {
- return Result.fail(MessageSourceUtils.getString("member_service_0038"));
+ return Result.fail(MessageSourceUtils.getString("member_service_0005"));
}
} else {
diff --git a/src/main/resources/i18n/messages_en_US.properties b/src/main/resources/i18n/messages_en_US.properties
index 0cb686d..79804a9 100644
--- a/src/main/resources/i18n/messages_en_US.properties
+++ b/src/main/resources/i18n/messages_en_US.properties
@@ -44,7 +44,8 @@
member_service_0011=Fail in send
member_service_0012=The verification code has expired, please request again
member_service_0013=Wrong verification code
-member_service_0014=Phone number binding succeeded
+member_service_0014=Binding succeeded
+member_service_1400=Binding fail
member_service_0015=Submit failed
member_service_0016=Mailbox cannot be empty
member_service_0017=Verification code cannot be empty
diff --git a/src/main/resources/i18n/messages_zh_CN.properties b/src/main/resources/i18n/messages_zh_CN.properties
index af87df0..7748554 100644
--- a/src/main/resources/i18n/messages_zh_CN.properties
+++ b/src/main/resources/i18n/messages_zh_CN.properties
@@ -44,7 +44,8 @@
member_service_0011=发送失败
member_service_0012=验证码已失效，请重新请求
member_service_0013=验证码有误
-member_service_0014=手机号绑定成功
+member_service_0014=绑定成功
+member_service_1400=绑定失败
member_service_0015=提交失败
member_service_0016=邮箱不能为空
member_service_0017=验证码不能为空
--
Gitblit v1.9.1