From faa81566316ada6dbd0d5d5f8b7100032f57d51c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 26 Aug 2020 12:04:36 +0800
Subject: [PATCH] modify entrust close order

---
 src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractEntrustOrderServiceImpl.java |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 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..6b60dba 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
@@ -299,22 +299,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;
         }

--
Gitblit v1.9.1