From f66b533cb3c000828561e136a4e92dcc929a0618 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 26 Aug 2020 14:44:57 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractEntrustOrderServiceImpl.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractEntrustOrderServiceImpl.java b/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractEntrustOrderServiceImpl.java
index 585b492..10db7db 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractEntrustOrderServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractEntrustOrderServiceImpl.java
@@ -294,27 +294,27 @@
}
// 获取最新价
- BigDecimal newPrice = new BigDecimal(redisUtils.getString(CoinTypeConvert.convertToKey(submitCloseEntrustDto.getSymbol())));
+ BigDecimal newPrice = new BigDecimal(redisUtils.getString(CoinTypeConvert.convertToKey(holdOrderEntity.getSymbol())));
int closeType;
if (holdOrderEntity.getOpeningType() == ContractHoldOrderEntity.OPENING_TYPE_MORE) {
// 开多, 若委托价低于当前价则立即成交
- if (submitCloseEntrustDto.getEntrustPrice().compareTo(newPrice) <= 0) {
- WholeCloseOrderDto wholeCloseOrderDto = new WholeCloseOrderDto();
- wholeCloseOrderDto.setCount(submitCloseEntrustDto.getSymbolCnt());
- wholeCloseOrderDto.setId(submitCloseEntrustDto.getId());
- return contractHoldOrderService.cancelHoldOrder(wholeCloseOrderDto);
- }
+// if (submitCloseEntrustDto.getEntrustPrice().compareTo(newPrice) <= 0) {
+// WholeCloseOrderDto wholeCloseOrderDto = new WholeCloseOrderDto();
+// wholeCloseOrderDto.setCount(submitCloseEntrustDto.getSymbolCnt());
+// wholeCloseOrderDto.setId(submitCloseEntrustDto.getId());
+// return contractHoldOrderService.cancelHoldOrder(wholeCloseOrderDto);
+// }
closeType = ContractOrderEntity.ORDER_TYPE_CLOSE_MORE;
} else {
// 开空, 若委托价高于当前价则立即成交
- if (submitCloseEntrustDto.getEntrustPrice().compareTo(newPrice) >= 0) {
- WholeCloseOrderDto wholeCloseOrderDto = new WholeCloseOrderDto();
- wholeCloseOrderDto.setCount(submitCloseEntrustDto.getSymbolCnt());
- wholeCloseOrderDto.setId(submitCloseEntrustDto.getId());
- return contractHoldOrderService.cancelHoldOrder(wholeCloseOrderDto);
- }
+// if (submitCloseEntrustDto.getEntrustPrice().compareTo(newPrice) >= 0) {
+// WholeCloseOrderDto wholeCloseOrderDto = new WholeCloseOrderDto();
+// wholeCloseOrderDto.setCount(submitCloseEntrustDto.getSymbolCnt());
+// wholeCloseOrderDto.setId(submitCloseEntrustDto.getId());
+// return contractHoldOrderService.cancelHoldOrder(wholeCloseOrderDto);
+// }
closeType = ContractOrderEntity.ORDER_TYPE_CLOSE_LESS;
}
@@ -322,7 +322,7 @@
MemberWalletContractEntity walletContract = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(member.getId(), CoinTypeConvert.convertContractTypeToCoin(holdOrderEntity.getSymbol()));
- BigDecimal lotNumber = cacheSettingUtils.getSymbolSku(submitCloseEntrustDto.getSymbol());
+ BigDecimal lotNumber = cacheSettingUtils.getSymbolSku(holdOrderEntity.getSymbol());
BigDecimal bondAmount = CalculateUtil.getBondAmount(holdOrderEntity.getOpeningPrice(), lotNumber, submitCloseEntrustDto.getSymbolCnt(), holdOrderEntity.getLeverRatio());
ContractEntrustOrderEntity entrustOrder = new ContractEntrustOrderEntity();
--
Gitblit v1.9.1