From fa91cc62d16b55c99d4cf6451ac6e2f1e0031dd5 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sat, 15 May 2021 18:35:15 +0800
Subject: [PATCH] 20210515 云顶
---
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 65 +++++++++++++++++++++-----------
1 files changed, 42 insertions(+), 23 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 29b20b2..f8fde74 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,6 +43,7 @@
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;
@@ -126,6 +129,9 @@
@Resource
private MemberWalletContractSimulateDao memberWalletContractSimulateDao;
+ @Autowired
+ private YdBasicLevelSettingDao ydBasicLevelSettingDao;
+
@Transactional()
@Override
public Result register(RegisterDto registerDto) {
@@ -166,7 +172,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);
@@ -174,9 +179,9 @@
memberDao.insert(member);
MemberSettingEntity memberSettingEntity = new MemberSettingEntity();
- memberSettingEntity.setSpread(BigDecimal.ONE);
- memberSettingEntity.setClosingSpread(BigDecimal.valueOf(5));
- memberSettingEntity.setForceParam(BigDecimal.valueOf(0.0055));
+ memberSettingEntity.setSpread(BigDecimal.valueOf(0.5));
+ memberSettingEntity.setClosingSpread(BigDecimal.valueOf(2));
+ memberSettingEntity.setForceParam(BigDecimal.valueOf(0.0085));
memberSettingEntity.setMemberId(member.getId());
memberSettingDao.insert(memberSettingEntity);
@@ -289,6 +294,7 @@
//获取用户ID
Long memberId = LoginUserUtils.getAppLoginUser().getId();
MemberEntity memberEntity = memberDao.selectById(memberId);
+
MemberInfoVo memberInfoVo = new MemberInfoVo();
if (ObjectUtil.isNotEmpty(memberEntity)) {
String email = memberEntity.getEmail();
@@ -299,6 +305,11 @@
memberInfoVo.setPhone(email);
}
+ if (memberEntity.getAgentLevel() != null) {
+ YdBasicLevelSettingEntity agent = ydBasicLevelSettingDao.selectById(memberEntity.getAgentLevel().longValue());
+ memberInfoVo.setAgentName(agent.getName());
+ memberInfoVo.setAgentId(agent.getId());
+ }
memberInfoVo.setInviteId(memberEntity.getInviteId());
}
return Result.ok(memberInfoVo);
@@ -861,9 +872,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);
@@ -872,7 +885,7 @@
}
@Override
- public Result memberAvivableCoinInfo(String symbol) {
+ public Result memberAvivableCoinInfo(String symbol,String lable) {
//获取用户ID
Long memberId = LoginUserUtils.getAppLoginUser().getId();
MemberWalletCoinEntity walletCoin = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, symbol);
@@ -883,7 +896,7 @@
List<MemberAvivableCoinInfoVo> arrayList = new ArrayList<>();
- List<PlatformFeeSettingEntity> feeSettingByTypeAndSymbolLable = platformFeeSettingDao.getFeeSettingsByTypeAndSymbol(2, symbol);
+ List<PlatformFeeSettingEntity> feeSettingByTypeAndSymbolLable = platformFeeSettingDao.getFeeSettingsByTypeAndSymbol(2, symbol,lable);
if (CollUtil.isEmpty(feeSettingByTypeAndSymbolLable)) {
return Result.fail(MessageSourceUtils.getString("member_service_0087"));
}
@@ -925,13 +938,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"));
}
@@ -1016,7 +1030,7 @@
@Override
public Result getAppVersionInfo() {
- MemberEntity memberEntity = LoginUserUtils.getAppLoginUser();
+// MemberEntity memberEntity = LoginUserUtils.getAppLoginUser();
Map<String, Object> columnMap = new HashMap<>();
List<AppVersionEntity> selectByMap = appVersionDao.selectByMap(columnMap);
@@ -1024,15 +1038,16 @@
if (CollUtil.isNotEmpty(selectByMap)) {
for (AppVersionEntity appVersionEntity : selectByMap) {
AppVersionVo appVersionVo = new AppVersionVo();
- if ("37059551".equals(memberEntity.getInviteId())) {
- appVersionVo.setAddress("www.baidu.com");
- appVersionVo.setType(appVersionEntity.getType());
- appVersionVo.setVersion(appVersionEntity.getVersion());
- } else {
- appVersionVo.setAddress(appVersionEntity.getAddress());
- appVersionVo.setType(appVersionEntity.getType());
- appVersionVo.setVersion(appVersionEntity.getVersion());
- }
+// if ("37059551".equals(memberEntity.getInviteId())) {
+// appVersionVo.setAddress("www.baidu.com");
+// appVersionVo.setType(appVersionEntity.getType());
+// appVersionVo.setVersion(appVersionEntity.getVersion());
+// } else {
+//
+// }
+ appVersionVo.setAddress(appVersionEntity.getAddress());
+ appVersionVo.setType(appVersionEntity.getType());
+ appVersionVo.setVersion(appVersionEntity.getVersion());
arrayList.add(appVersionVo);
}
}
@@ -1096,7 +1111,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