From e772e9373d2dc03b1bba1da13a8cbeb46d111a94 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 26 Aug 2020 17:05:03 +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 acf60a0..fcc94a2 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
@@ -315,22 +315,22 @@
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;
}
@@ -351,13 +351,13 @@
entrustOrder.setLeverRatio(holdOrderEntity.getLeverRatio());
entrustOrder.setSymbolSku(holdOrderEntity.getSymbolSku());
entrustOrder.setEntrustType(closeType);
- entrustOrder.setSymbolCnt(holdOrderEntity.getSymbolCnt());
+ entrustOrder.setSymbolCnt(submitCloseEntrustDto.getSymbolCnt());
entrustOrder.setSymbol(holdOrderEntity.getSymbol());
int i = contractEntrustOrderDao.insert(entrustOrder);
- memberWalletContractDao.increaseWalletContractBalanceById(null, null, bondAmount, walletContract.getId());
+// memberWalletContractDao.increaseWalletContractBalanceById(null, null, bondAmount, walletContract.getId());
if (i > 0) {
// 发送委托消息
--
Gitblit v1.9.1