From f8c1d9838e3c337d0dc9f406fb1b2b54e2be06b5 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 13 May 2021 11:36:22 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 38 ++++++++++++++++++++++----------------
1 files changed, 22 insertions(+), 16 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..12a030b 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
@@ -174,9 +174,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);
@@ -872,7 +872,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 +883,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,6 +925,7 @@
}
@Override
+ @Transactional
public Result memberSubmitCoinApply(@Valid MemberSubmitCoinApplyDto memberSubmitCoinApplyDto) {
//获取用户ID
Long memberId = LoginUserUtils.getAppLoginUser().getId();
@@ -1016,7 +1017,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 +1025,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 +1098,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