From 2b8b6b15c284bb5f75309ff695666f1da35a130a Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 18 May 2021 18:43:26 +0800
Subject: [PATCH] Merge branch 'yunding' of http://120.27.238.55:7000/r/exchange into yunding
---
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 9 ++++++++-
1 files changed, 8 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 f8fde74..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
@@ -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 == memberEntity.getIsTrader()) {
+ memberInfoVo.setAgentName("合伙人");
+ memberInfoVo.setAgentId(3L);
+ }
+
memberInfoVo.setInviteId(memberEntity.getInviteId());
}
return Result.ok(memberInfoVo);
--
Gitblit v1.9.1