From a7b10c7fb28552e71e980d97a6b23c21cbcb212a Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 28 May 2021 14:37:47 +0800
Subject: [PATCH] 20210528
---
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 41 +++++++++++++++++++++++++++++++++--------
1 files changed, 33 insertions(+), 8 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 34ce5af..0b38e62 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;
@@ -126,6 +130,9 @@
@Resource
private MemberWalletContractSimulateDao memberWalletContractSimulateDao;
+ @Resource
+ private YdBasicLevelSettingDao ydBasicLevelSettingDao;
+
@Transactional()
@Override
public Result register(RegisterDto registerDto) {
@@ -166,7 +173,6 @@
member.setRefererId(registerDto.getRefererId());
member.setAccountStatus(MemberEntity.ACCOUNT_STATUS_ENABLE);
member.setAccountType(MemberEntity.ACCOUNT_TYPE_NORMAL);
- member.setAgentLevel(MemberEntity.ACCOUNT_AGENT_LEVEL);
member.setCertifyStatus(MemberEntity.CERTIFY_STATUS_UN_SUBMIT);
member.setIsForce(1);
member.setIsProfit(0);
@@ -289,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();
@@ -298,6 +305,17 @@
} 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());
}
@@ -861,9 +879,11 @@
List<MemberCoinInfoVo> arrayList = new ArrayList<>();
if (CollUtil.isNotEmpty(selectByMap)) {
for (PlatformSymbolsCoinEntity platformSymbolsCoinEntity : selectByMap) {
- MemberCoinInfoVo memberCoinInfoVo = new MemberCoinInfoVo();
- memberCoinInfoVo.setName(platformSymbolsCoinEntity.getName());
- arrayList.add(memberCoinInfoVo);
+ if ("XCH".equals(platformSymbolsCoinEntity.getName()) || "USDT".equals(platformSymbolsCoinEntity.getName())) {
+ MemberCoinInfoVo memberCoinInfoVo = new MemberCoinInfoVo();
+ memberCoinInfoVo.setName(platformSymbolsCoinEntity.getName());
+ arrayList.add(memberCoinInfoVo);
+ }
}
}
memberCoinInfoListVo.setMemberCoinInfoVo(arrayList);
@@ -925,13 +945,14 @@
}
@Override
+ @Transactional
public Result memberSubmitCoinApply(@Valid MemberSubmitCoinApplyDto memberSubmitCoinApplyDto) {
//获取用户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"));
}
@@ -1097,7 +1118,11 @@
addressIn = address;
} else {
MemberCoinAddressEntity memberCoinAddressEntity = selectByMap2.get(0);
- addressIn = memberCoinAddressEntity.getAddress();
+ if(StrUtil.isEmpty(memberCoinAddressEntity.getAddress())){
+ addressIn = selectMemberInfoByAccount.getInviteId();
+ }else{
+ addressIn = memberCoinAddressEntity.getAddress();
+ }
}
MemberWalletCoinEntity walletCoin = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, memberSubmitCoinApplyInDto.getSymbol());
--
Gitblit v1.9.1