From 19a0ffbf9653be38d3f366fc25cda8357e534086 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 26 Mar 2021 10:03:37 +0800
Subject: [PATCH] Merge branch 'activity' of http://120.27.238.55:7000/r/exchange into activity
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 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 2489c0f..6f4d0ce 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
@@ -97,13 +97,17 @@
if (ids.size() == 1) {
ContractHoldOrderEntity holdOrderEntity = contractHoldOrderDao.selectById(ids.get(0));
- // 判断仓位类型是否逐仓
- if (holdOrderEntity.getPositionType() == ContractEntrustOrderEntity.POSITION_TYPE_ADD) {
- // 逐仓平仓
- cancelHoldOrderMethod(holdOrderEntity);
+ if (holdOrderEntity != null) {
+ // 判断仓位类型是否逐仓
+ if (holdOrderEntity.getPositionType() == ContractEntrustOrderEntity.POSITION_TYPE_ADD) {
+ // 逐仓平仓
+ cancelHoldOrderMethod(holdOrderEntity);
+ } else {
+ // 全仓模式平仓
+ closingWholeOrder(holdOrderEntity);
+ }
} else {
- // 全仓模式平仓
- closingWholeOrder(holdOrderEntity);
+ log.info("持仓订单为空: {}", ids.get(0));
}
} else {
List<ContractHoldOrderEntity> holdOrderEntities = contractHoldOrderDao.selectBatchIds(ids);
--
Gitblit v1.9.1