From 17b12b82967c65d170b7bda3c79e3aa76ecfa746 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 28 Aug 2020 14:48:59 +0800
Subject: [PATCH] Merge branch 'whole' of https://gitee.com/chonggaoxiao/new_excoin into whole

---
 src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 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 9037b2c..c52b315 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
@@ -327,6 +327,14 @@
                 contractHoldOrderDao.updateById(holdOrderEntity);
             } else {
                 contractHoldOrderDao.deleteById(holdOrderEntity.getId());
+
+                // 若平掉所有张数,若存在委托平仓,则删除委托平仓记录
+                List<ContractEntrustOrderEntity> entrustOrders = contractEntrustOrderDao.selectEntrustOrderByOrderNo(holdOrderEntity.getOrderNo());
+                if (CollUtil.isNotEmpty(entrustOrders)) {
+                    for (ContractEntrustOrderEntity entrustOrder : entrustOrders) {
+                        contractEntrustOrderDao.deleteById(entrustOrder.getId());
+                    }
+                }
             }
 
             BigDecimal changeAmount = profitOrLoss.add(bondAmount);

--
Gitblit v1.9.1