From c496fc3162bbd0c1219110df02611ac1433a1403 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 25 Nov 2020 17:55:35 +0800
Subject: [PATCH] 20201125
---
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 59 ++++++++++++++++++++++++++++++++---------------------------
1 files changed, 32 insertions(+), 27 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 236956c..97fddff 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
@@ -275,17 +275,15 @@
Long memberId = LoginUserUtils.getAppLoginUser().getId();
MemberEntity memberEntity = memberDao.selectById(memberId);
MemberInfoVo memberInfoVo = new MemberInfoVo();
+
if (ObjectUtil.isNotEmpty(memberEntity)) {
- String email = memberEntity.getEmail();
- String phone = memberEntity.getPhone();
- if (StrUtil.isNotEmpty(phone)) {
- memberInfoVo.setPhone(phone);
- } else if (StrUtil.isNotEmpty(email)) {
- memberInfoVo.setPhone(email);
- }
-
+ String address = memberEntity.getAddress();
+ WtWallet wtWallet = wtWalletDao.selectSimpleById(address);
+ String walletName = wtWallet.getWalletName();
+ memberInfoVo.setWalletName(walletName);
memberInfoVo.setInviteId(memberEntity.getInviteId());
}
+
return Result.ok(memberInfoVo);
}
@@ -493,7 +491,7 @@
return Result.fail(MessageSourceUtils.getString("member_service_0003"));
}
String token = LoginUserUtils.getAppLoginUserToken();
- redisUtils.del(AppContants.APP_LOGIN_PREFIX + token);
+ redisUtils.del(token);
SecurityContextHolder.clearContext();
return Result.ok(MessageSourceUtils.getString("member_service_0071"));
}
@@ -1182,25 +1180,32 @@
String inviteId = ShareCodeUtil.toSerialCode(member.getId());
member.setInviteId(inviteId);
-
- boolean flag = false;
- String parentId = member.getRefererId();
- String ids = "";
- while (!flag && StringUtils.isNotBlank(parentId)) {
- ids += ("," + parentId);
- MemberEntity parentMember = memberDao.selectMemberInfoByInviteId(parentId);
- if (parentMember == null) {
- break;
- }
- parentId = parentMember.getRefererId();
- if(StringUtils.isBlank(parentId)){
- break;
- }
- if (parentMember.getRefererId().equals(parentMember.getInviteId())) {
- flag = true;
- }
+
+ String refererId = outCenterRegisterDto.getRefererId();
+ if(StrUtil.isNotEmpty(refererId)) {
+ MemberEntity selectMemberInfoByInviteId = memberDao.selectMemberInfoByInviteId(refererId);
+ if(ObjectUtil.isNotEmpty(selectMemberInfoByInviteId)) {
+ boolean flag = false;
+ String parentId = member.getRefererId();
+ String ids = "";
+ while (!flag && StringUtils.isNotBlank(parentId)) {
+ ids += ("," + parentId);
+ MemberEntity parentMember = memberDao.selectMemberInfoByInviteId(parentId);
+ if (parentMember == null) {
+ break;
+ }
+ parentId = parentMember.getRefererId();
+ if(StringUtils.isBlank(parentId)){
+ break;
+ }
+ if (parentMember.getRefererId().equals(parentMember.getInviteId())) {
+ flag = true;
+ }
+ }
+ member.setRefererIds(ids);
+ }
}
- member.setRefererIds(ids);
+
memberDao.updateById(member);
//初始化合约钱包
--
Gitblit v1.9.1