From 3bc7c53fe0ecd6fa51c9d90c972987af40687ffe Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 11 Sep 2020 10:29:47 +0800
Subject: [PATCH] Merge branch 'master' into whole
---
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 2 +-
src/test/java/com/xcong/excoin/SymbolsTest.java | 13 +++++++++++++
2 files changed, 14 insertions(+), 1 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 35f8d7d..279e2a7 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
@@ -166,7 +166,7 @@
MemberSettingEntity memberSettingEntity = new MemberSettingEntity();
memberSettingEntity.setSpread(BigDecimal.ONE);
memberSettingEntity.setClosingSpread(BigDecimal.valueOf(5));
- memberSettingEntity.setForceParam(BigDecimal.valueOf(0.0030));
+ memberSettingEntity.setForceParam(BigDecimal.valueOf(0.0055));
memberSettingEntity.setMemberId(member.getId());
memberSettingDao.insert(memberSettingEntity);
diff --git a/src/test/java/com/xcong/excoin/SymbolsTest.java b/src/test/java/com/xcong/excoin/SymbolsTest.java
index 417e941..e46dc05 100644
--- a/src/test/java/com/xcong/excoin/SymbolsTest.java
+++ b/src/test/java/com/xcong/excoin/SymbolsTest.java
@@ -8,6 +8,7 @@
import com.xcong.excoin.modules.contract.dao.ContractHoldOrderDao;
import com.xcong.excoin.modules.contract.dao.ContractOrderDao;
import com.xcong.excoin.modules.contract.entity.ContractHoldOrderEntity;
+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.MemberWalletContractDao;
@@ -126,4 +127,16 @@
BigDecimal forceSetPrice = CalculateUtil.getForceSetPrice(hold.getBondAmount(), hold.getOpeningPrice(), hold.getSymbolCnt(), hold.getSymbolSku(), hold.getOpeningType(), memberEntity);
System.out.println(forceSetPrice);
}
+
+ @Resource
+ private ContractHoldOrderService contractHoldOrderService;
+
+ @Test
+ public void holdAmountTest() {
+ try {
+ contractHoldOrderService.calHoldOrderHoldFeeAmount();
+ } catch (Exception e) {
+ log.info("-->", e);
+ }
+ }
}
--
Gitblit v1.9.1