From 7e3ef24a24df87f71beedefeec3febb1ce13b094 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 18 May 2021 18:56:59 +0800
Subject: [PATCH] 20210518
---
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 41 +++++++++++++++++++++++++++++------------
1 files changed, 29 insertions(+), 12 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 e70ba1f..6c74a62 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
@@ -45,6 +45,8 @@
import com.xcong.excoin.modules.member.vo.MemberQuickBuySaleVo;
import com.xcong.excoin.modules.member.vo.MemberQuickSaleVo;
+import com.xcong.excoin.modules.yunding.entity.BasicLevelSettingEntity;
+import com.xcong.excoin.modules.yunding.mapper.BasicLevelSettingMapper;
import lombok.RequiredArgsConstructor;
import java.math.BigDecimal;
import java.text.DecimalFormat;
@@ -90,6 +92,8 @@
private final MemberAuthenticationMapper memberAuthenticationMapper;
private final AgentFriendRelationMapper agentFriendRelationMapper;
+
+ private final BasicLevelSettingMapper basicLevelSettingMapper;
@Override
public IPage<AgentFriendRelationEntity> findAgentInfoListInPage(AgentFriendRelationEntity agentFriendRelationEntity,
@@ -206,6 +210,10 @@
String firstName = (memberEntitys.getFirstName() == null ? "" : memberEntitys.getFirstName());
String secondName = (memberEntitys.getSecondName() == null ? "" : memberEntitys.getSecondName());
memberEntitys.setRealName(firstName+secondName);
+ if (memberEntitys.getAgentLevel() != null) {
+ BasicLevelSettingEntity agent = basicLevelSettingMapper.selectById(memberEntitys.getAgentLevel().longValue());
+ memberEntitys.setAgentName(agent.getName());
+ }
}
}
return selectMemberListInPage;
@@ -514,23 +522,32 @@
memberWalletCoinMapper.updateById(walletCoin);
if ("Y".equals(selectById.getIsInside())) {
- Map<String, Object> columnMap = new HashMap<>();
- columnMap.put("symbol", symbol);
- columnMap.put("address", address);
- // 如果是内部转账 则需要将币加到内部地址
- List<MemberCoinAddressEntity> selectByMap = memberCoinAddressMapper.selectByMap(columnMap);
+
Long aimMemberId = null;
- if(CollUtil.isEmpty(selectByMap)) {
-// return new FebsResponse().message("地址有误，请拒绝！");
-// throw new GlobalException("地址有误，请拒绝！");
- MemberEntity memberEntity = memberMapper.selectMemberInfoByQueryKey(address);
+ if(symbol.equals("XCH")){
+ MemberEntity memberEntity = memberMapper.selectMemberByInviteId(address);
if (memberEntity == null) {
throw new GlobalException("地址有误或用户不存在，请拒绝！");
}
-
aimMemberId = memberEntity.getId();
- } else {
- aimMemberId = selectByMap.get(0).getMemberId();
+ }else{
+ Map<String, Object> columnMap = new HashMap<>();
+ columnMap.put("symbol", symbol);
+ columnMap.put("address", address);
+ // 如果是内部转账 则需要将币加到内部地址
+ List<MemberCoinAddressEntity> selectByMap = memberCoinAddressMapper.selectByMap(columnMap);
+ if(CollUtil.isEmpty(selectByMap)) {
+// return new FebsResponse().message("地址有误，请拒绝！");
+// throw new GlobalException("地址有误，请拒绝！");
+ MemberEntity memberEntity = memberMapper.selectMemberInfoByQueryKey(address);
+ if (memberEntity == null) {
+ throw new GlobalException("地址有误或用户不存在，请拒绝！");
+ }
+
+ aimMemberId = memberEntity.getId();
+ } else {
+ aimMemberId = selectByMap.get(0).getMemberId();
+ }
}
MemberWalletCoinEntity aimWalletCoin = memberWalletCoinMapper.findWalletCoinByMemberIdAndWalletCode(aimMemberId, symbol);
--
Gitblit v1.9.1