From 0eb3935f903871f051c3a7937eab80e1b1a31787 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 08 Jun 2020 15:52:20 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin
---
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 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 4b4e073..928582a 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
@@ -229,7 +229,14 @@
MemberEntity memberEntity = memberDao.selectById(memberId);
MemberInfoVo memberInfoVo = new MemberInfoVo();
if (ObjectUtil.isNotEmpty(memberEntity)) {
- memberInfoVo.setPhone(memberEntity.getPhone());
+ String email = memberEntity.getEmail();
+ String phone = memberEntity.getPhone();
+ if(StrUtil.isNotEmpty(phone)) {
+ memberInfoVo.setPhone(phone);
+ }else if(StrUtil.isNotEmpty(email)) {
+ memberInfoVo.setPhone(email);
+ }
+
memberInfoVo.setInviteId(memberEntity.getInviteId());
}
return Result.ok(memberInfoVo);
@@ -878,6 +885,23 @@
}
}
+ @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("");
+ }
+
}
--
Gitblit v1.9.1