From a1412fa71d550b7f3063369a0e5141bab995953d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 17 Jun 2021 17:20:47 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 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 68f0586..e62d043 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
@@ -47,6 +47,7 @@
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;
@@ -129,7 +130,7 @@
@Resource
private MemberWalletContractSimulateDao memberWalletContractSimulateDao;
- @Autowired
+ @Resource
private YdBasicLevelSettingDao ydBasicLevelSettingDao;
@Transactional()
@@ -310,6 +311,12 @@
memberInfoVo.setAgentName(agent.getName());
memberInfoVo.setAgentId(agent.getId());
}
+
+ if (MemberEntity.IS_TRADER_Y.equals(memberEntity.getIsTrader())) {
+ memberInfoVo.setAgentName("合伙人");
+ memberInfoVo.setAgentId(3L);
+ }
+
memberInfoVo.setInviteId(memberEntity.getInviteId());
}
return Result.ok(memberInfoVo);
@@ -943,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