From d564d6930e956631f6219d5cf477a12e67b8da95 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 02 Jul 2020 19:07:20 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin
---
src/main/resources/i18n/messages_zh_CN.properties | 1 +
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 3 +++
src/main/resources/i18n/messages_en_US.properties | 1 +
3 files changed, 5 insertions(+), 0 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 b66d2fc..8bdd47d 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
@@ -320,6 +320,9 @@
//获取用户ID
Long memberId = LoginUserUtils.getAppLoginUser().getId();
MemberEntity member = memberDao.selectById(memberId);
+ if(MemberEntity.CERTIFY_STATUS_ING.equals(member.getCertifyStatus())) {
+ return Result.fail(MessageSourceUtils.getString("member_service_4000"));
+ }
if (ObjectUtil.isNotEmpty(member)) {
MemberAuthenticationEntity memberAuthenticationEntity = new MemberAuthenticationEntity();
if (MemberEntity.CERTIFY_STATUS_Y == member.getCertifyStatus()) {
diff --git a/src/main/resources/i18n/messages_en_US.properties b/src/main/resources/i18n/messages_en_US.properties
index 9f50904..1ae789b 100644
--- a/src/main/resources/i18n/messages_en_US.properties
+++ b/src/main/resources/i18n/messages_en_US.properties
@@ -74,6 +74,7 @@
member_service_0038=Verification code is invalid
member_service_0039=Verification code error
member_service_0040=Modification succeeded
+member_service_4000=Information auditing
member_service_0041=Modification failed
member_service_0042=Please enter your mobile number
diff --git a/src/main/resources/i18n/messages_zh_CN.properties b/src/main/resources/i18n/messages_zh_CN.properties
index 1a3203b..c3553d9 100644
--- a/src/main/resources/i18n/messages_zh_CN.properties
+++ b/src/main/resources/i18n/messages_zh_CN.properties
@@ -74,6 +74,7 @@
member_service_0038=验证码已失效
member_service_0039=验证码错误
member_service_0040=修改成功
+member_service_4000=信息审核中
member_service_0041=修改失败
member_service_0042=请输入手机号码
--
Gitblit v1.9.1