From 0e2ecf41e6ff7dadd8b2f5bd18d118e88f23d9eb Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 30 Mar 2021 16:37:13 +0800
Subject: [PATCH] modify

---
 src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java b/src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java
index e66c855..ba5c3a1 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java
@@ -113,7 +113,14 @@
                     List<ContractHoldOrderEntity> holdOrderEntities = contractHoldOrderDao.selectBatchIds(ids);
                     if (CollUtil.isNotEmpty(holdOrderEntities)) {
                         for (ContractHoldOrderEntity holdOrder : holdOrderEntities) {
-                            cancelHoldOrderMethod(holdOrder);
+                            // 判断仓位类型是否逐仓
+                            if (holdOrder.getPositionType() == ContractEntrustOrderEntity.POSITION_TYPE_ADD) {
+                                // 逐仓平仓
+                                cancelHoldOrderMethod(holdOrder);
+                            } else {
+                                // 全仓模式平仓
+                                closingWholeOrder(holdOrder);
+                            }
                         }
                     }
                 }

--
Gitblit v1.9.1