From 0469ade9be848d97eefb92f3e584441d89e6b69d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 20 May 2021 19:32:05 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 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 34ce013..17e5f59 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
@@ -34,6 +34,8 @@
import com.xcong.excoin.modules.platform.dao.PlatformSymbolsCoinDao;
import com.xcong.excoin.modules.platform.entity.PlatformFeeSettingEntity;
import com.xcong.excoin.modules.platform.entity.PlatformSymbolsCoinEntity;
+import com.xcong.excoin.modules.yunding.dao.YdBasicLevelSettingDao;
+import com.xcong.excoin.modules.yunding.entity.YdBasicLevelSettingEntity;
import com.xcong.excoin.utils.MessageSourceUtils;
import com.xcong.excoin.utils.RedisUtils;
import com.xcong.excoin.utils.ShareCodeUtil;
@@ -41,9 +43,11 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.Put;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import sun.management.resources.agent;
import java.math.BigDecimal;
import java.util.ArrayList;
@@ -125,6 +129,9 @@
@Resource
private MemberWalletContractSimulateDao memberWalletContractSimulateDao;
+
+ @Resource
+ private YdBasicLevelSettingDao ydBasicLevelSettingDao;
@Transactional()
@Override
@@ -288,6 +295,7 @@
//获取用户ID
Long memberId = LoginUserUtils.getAppLoginUser().getId();
MemberEntity memberEntity = memberDao.selectById(memberId);
+
MemberInfoVo memberInfoVo = new MemberInfoVo();
if (ObjectUtil.isNotEmpty(memberEntity)) {
String email = memberEntity.getEmail();
@@ -296,6 +304,17 @@
memberInfoVo.setPhone(phone);
} else if (StrUtil.isNotEmpty(email)) {
memberInfoVo.setPhone(email);
+ }
+
+ if (memberEntity.getAgentLevel() != null) {
+ YdBasicLevelSettingEntity agent = ydBasicLevelSettingDao.selectById(memberEntity.getAgentLevel().longValue());
+ memberInfoVo.setAgentName(agent.getName());
+ memberInfoVo.setAgentId(agent.getId());
+ }
+
+ if (MemberEntity.IS_TRADER_Y == memberEntity.getIsTrader()) {
+ memberInfoVo.setAgentName("合伙人");
+ memberInfoVo.setAgentId(3L);
}
memberInfoVo.setInviteId(memberEntity.getInviteId());
@@ -931,9 +950,9 @@
//获取用户ID
Long memberId = LoginUserUtils.getAppLoginUser().getId();
MemberEntity member = memberDao.selectById(memberId);
- if (member.getCertifyStatus() != MemberEntity.CERTIFY_STATUS_Y) {
- return Result.fail(MessageSourceUtils.getString("member_service_0077"));
- }
+// if (member.getCertifyStatus() != MemberEntity.CERTIFY_STATUS_Y) {
+// return Result.fail(MessageSourceUtils.getString("member_service_0077"));
+// }
if (StrUtil.isEmpty(member.getTradePassword())) {
return Result.fail(MessageSourceUtils.getString("member_service_0081"));
}
--
Gitblit v1.9.1