From f97a701a3cceed8cb86fce14124c1c67a0f59ae0 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 08 Jun 2020 12:03:23 +0800
Subject: [PATCH] 20200608 代码提交
---
src/main/resources/i18n/messages_zh_CN.properties | 2 +-
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 17 +++++++++++++++++
src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java | 14 ++++++++++++++
src/main/resources/i18n/messages_en_US.properties | 2 +-
src/main/java/com/xcong/excoin/modules/member/service/MemberService.java | 2 ++
5 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java b/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java
index 3512121..842132f 100644
--- a/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java
+++ b/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java
@@ -79,6 +79,20 @@
}
/**
+ * 验证账户是否存在
+ * @return
+ */
+ @ApiOperation(value="验证账户是否存在", notes="验证账户是否存在")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "account", value = "账号", required = true, dataType = "String", paramType="query"),
+ @ApiImplicitParam(name = "type", value = "类型 1：手机号 2：邮箱", required = true, dataType = "int", paramType="query")
+ })
+ @GetMapping(value = "/getMemberAccountInfo")
+ public Result getMemberAccountInfo(String account,int type) {
+ return memberService.getMemberAccountInfo(account,type);
+ }
+
+ /**
* 修改密码
* @return
*/
diff --git a/src/main/java/com/xcong/excoin/modules/member/service/MemberService.java b/src/main/java/com/xcong/excoin/modules/member/service/MemberService.java
index 4f945e9..8f0ecee 100644
--- a/src/main/java/com/xcong/excoin/modules/member/service/MemberService.java
+++ b/src/main/java/com/xcong/excoin/modules/member/service/MemberService.java
@@ -84,5 +84,7 @@
public Result memberSubmitCoinApply(@Valid MemberSubmitCoinApplyDto memberSubmitCoinApplyDto);
+ public Result getMemberAccountInfo(String account,int type);
+
}
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 a89f189..cea30ba 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
@@ -875,6 +875,23 @@
return Result.fail(MessageSourceUtils.getString("member_service_0039"));
}
}
+
+ @Override
+ public Result getMemberAccountInfo(String account,int type) {
+
+ Map<String, Object> hashMap = new HashMap<>();
+ if(type == 1) {
+ hashMap.put("phone", account);
+ }else {
+ hashMap.put("email", account);
+ }
+ List<MemberEntity> member = memberDao.selectByMap(hashMap);
+ if (CollUtil.isEmpty(member)) {
+ return Result.fail(MessageSourceUtils.getString("home_service_0003"));
+ }
+
+ return Result.ok("");
+ }
}
diff --git a/src/main/resources/i18n/messages_en_US.properties b/src/main/resources/i18n/messages_en_US.properties
index 38ffc9c..70c547e 100644
--- a/src/main/resources/i18n/messages_en_US.properties
+++ b/src/main/resources/i18n/messages_en_US.properties
@@ -80,7 +80,7 @@
member_service_0044=Please input a password
member_service_0045=Verification code is invalid, please resend
member_service_0046=The verification code entered is wrong, please re-enter
-member_service_0047=The mobile number does not exist, please register and log in
+member_service_0047=please register and log in
member_service_0048=Modification succeeded, please log in
member_service_0049=Verification code is invalid
member_service_0050=Verification code error
diff --git a/src/main/resources/i18n/messages_zh_CN.properties b/src/main/resources/i18n/messages_zh_CN.properties
index e24d581..d743f1a 100644
--- a/src/main/resources/i18n/messages_zh_CN.properties
+++ b/src/main/resources/i18n/messages_zh_CN.properties
@@ -80,7 +80,7 @@
member_service_0044=请输入密码
member_service_0045=验证码已失效，请重新发送
member_service_0046=输入的验证码有误，请重新输入
-member_service_0047=不存在该手机号码，请进行注册登录
+member_service_0047=请进行注册登录
member_service_0048=修改成功，请登录
member_service_0049=验证码已失效
member_service_0050=验证码错误
--
Gitblit v1.9.1