From 73df4e310e920e44183cf32124d6d2b311b6a6d3 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 08 Jun 2020 16:57:31 +0800
Subject: [PATCH] modify

---
 src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java |   28 ++++++++++++++++++++++++++--
 1 files changed, 26 insertions(+), 2 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..044d8f6 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
@@ -149,7 +149,7 @@
         member.setAccountStatus(MemberEntity.ACCOUNT_STATUS_ENABLE);
         member.setAccountType(registerDto.getType());
         member.setAgentLevel(MemberEntity.ACCOUNT_AGENT_LEVEL);
-        member.setCertifyStatus(MemberEntity.CERTIFY_STATUS_ING);
+        member.setCertifyStatus(MemberEntity.CERTIFY_STATUS_UN_SUBMIT);
         member.setIsForce(0);
         member.setIsProfit(0);
         memberDao.insert(member);
@@ -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