From 0854f968f2b696ea4c39ef175b083c0a55116418 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 30 Mar 2021 21:53:23 +0800
Subject: [PATCH] Merge branch 'activity' of http://120.27.238.55:7000/r/exchange into activity
---
src/test/java/com/xcong/excoin/WholeTest.java | 20 ++------------------
1 files changed, 2 insertions(+), 18 deletions(-)
diff --git a/src/test/java/com/xcong/excoin/WholeTest.java b/src/test/java/com/xcong/excoin/WholeTest.java
index 36b5d9d..83ee582 100644
--- a/src/test/java/com/xcong/excoin/WholeTest.java
+++ b/src/test/java/com/xcong/excoin/WholeTest.java
@@ -200,26 +200,10 @@
@Test
public void wholeForceNewTest() {
- String symbol = "BTC/USDT";
MemberEntity memberEntity = memberDao.selectById(15L);
- ContractHoldOrderEntity holdOrder = contractHoldOrderDao.selectById(144L);
- List<ContractHoldOrderEntity> wholeOrders = contractHoldOrderDao.selectHoldOrderListForWholeByMemberIdAndSymbol(memberEntity.getId(), null);
- MemberWalletContractEntity wallet = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(memberEntity.getId(), CoinTypeEnum.USDT.name());
- if (CollUtil.isNotEmpty(wholeOrders)) {
- BigDecimal totalProfitOrLoss = BigDecimal.ZERO;
- BigDecimal otherSymbolBond = BigDecimal.ZERO;
- for (ContractHoldOrderEntity wholeOrder : wholeOrders) {
- BigDecimal profitOrLoss = CalculateUtil.calProfitOrLoss(wholeOrder, memberEntity);
- totalProfitOrLoss = totalProfitOrLoss.add(profitOrLoss);
- if (!wholeOrder.getId().equals(holdOrder.getId())) {
- otherSymbolBond = otherSymbolBond.add(wholeOrder.getBondAmount());
- }
- }
+ ContractHoldOrderEntity holdOrder = contractHoldOrderDao.selectById(300L);
- BigDecimal bond = wallet.getTotalBalance().add(totalProfitOrLoss).subtract(otherSymbolBond);
- System.out.println(bond);
- System.out.println(CalculateUtil.getForceSetPrice(bond, holdOrder.getOpeningPrice(), holdOrder.getSymbolCntSale(), holdOrder.getSymbolSku(), holdOrder.getOpeningType(), memberEntity));
- }
+ System.out.println(CalculateUtil.calForcePriceForWhole(memberEntity, holdOrder));
}
}
--
Gitblit v1.9.1