From 98e3ca12ee10d7e304b61797f2cbe37fda629a25 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 26 Mar 2021 11:44:44 +0800
Subject: [PATCH] Merge branch 'activity' of http://120.27.238.55:7000/r/exchange into activity
---
src/test/java/com/xcong/excoin/MemberSettingTest.java | 21 +++++++++++++++++++++
src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java | 1 +
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 15 +++++++++------
3 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java b/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java
index 8f05796..7a9967d 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java
@@ -951,6 +951,7 @@
contractMoneyInfoVo.setLeverRate(rateEntity.getLevelRateUp());
contractMoneyInfoVo.setMoreBondAmount(moreBondAmount);
contractMoneyInfoVo.setLessBondAmount(lessBondAmount);
+ contractMoneyInfoVo.setProfitOrLess(totalProfitOrLess);
return Result.ok(contractMoneyInfoVo);
}
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 c4d3fa1..29b20b2 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
@@ -1085,16 +1085,19 @@
}
Long memberInfoId = selectMemberInfoByAccount.getId();
String symbol = memberSubmitCoinApplyInDto.getSymbol();
-
+
+ String addressIn = "";
Map<String, Object> columnMapAddress = new HashMap<>();
columnMapAddress.put("member_id", memberInfoId);
columnMapAddress.put("symbol", symbol);
- List<MemberCoinAddressEntity> selectByMap2 = memberCoinAddressDao.selectByMap(columnMapAddress );
+ List<MemberCoinAddressEntity> selectByMap2 = memberCoinAddressDao.selectByMap(columnMapAddress);
if(CollUtil.isEmpty(selectByMap2)) {
- return Result.fail(MessageSourceUtils.getString("member_service_0087"));
- }
- MemberCoinAddressEntity memberCoinAddressEntity = selectByMap2.get(0);
- String addressIn = memberCoinAddressEntity.getAddress();
+// return Result.fail(MessageSourceUtils.getString("member_service_0087"));
+ addressIn = address;
+ } else {
+ MemberCoinAddressEntity memberCoinAddressEntity = selectByMap2.get(0);
+ addressIn = memberCoinAddressEntity.getAddress();
+ }
MemberWalletCoinEntity walletCoin = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, memberSubmitCoinApplyInDto.getSymbol());
BigDecimal availableBalance = walletCoin.getAvailableBalance();
diff --git a/src/test/java/com/xcong/excoin/MemberSettingTest.java b/src/test/java/com/xcong/excoin/MemberSettingTest.java
index 292cd54..fb1c627 100644
--- a/src/test/java/com/xcong/excoin/MemberSettingTest.java
+++ b/src/test/java/com/xcong/excoin/MemberSettingTest.java
@@ -1,9 +1,12 @@
package com.xcong.excoin;
+import com.xcong.excoin.common.enumerates.SymbolEnum;
import com.xcong.excoin.modules.contract.service.ContractHoldOrderService;
import com.xcong.excoin.modules.member.dao.MemberDao;
+import com.xcong.excoin.modules.member.dao.MemberLevelRateDao;
import com.xcong.excoin.modules.member.dao.MemberSettingDao;
import com.xcong.excoin.modules.member.entity.MemberEntity;
+import com.xcong.excoin.modules.member.entity.MemberLevelRateEntity;
import com.xcong.excoin.modules.member.entity.MemberSettingEntity;
import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.Test;
@@ -57,4 +60,22 @@
public void holdTest() {
contractHoldOrderService.calHoldFeeAmountForBondAmount();
}
+
+ @Autowired
+ private MemberLevelRateDao memberLevelRateDao;
+
+ @Test
+ public void memberLeverRateTest() {
+ List<MemberEntity> memberEntities = memberDao.selectAllMember();
+
+ for (MemberEntity member : memberEntities) {
+ for (SymbolEnum symbolEnum : SymbolEnum.values()) {
+ MemberLevelRateEntity levelRate = new MemberLevelRateEntity();
+ levelRate.setMemberId(member.getId());
+ levelRate.setSymbol(symbolEnum.getValue());
+ memberLevelRateDao.insert(levelRate);
+ }
+ }
+
+ }
}
--
Gitblit v1.9.1