From 2d3de81973303a8f4e124473d69b2b9f77c38e99 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 28 Aug 2020 17:50:14 +0800
Subject: [PATCH] modify

---
 src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java |   10 ++++++++++
 1 files changed, 10 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..db65c8c 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
@@ -324,9 +324,19 @@
             if (holdOrderEntity.getSymbolCntSale() != 0) {
                 holdOrderEntity.setOpeningFeeAmount(holdOrderEntity.getOpeningFeeAmount().subtract(fee));
                 holdOrderEntity.setBondAmount(holdOrderEntity.getBondAmount().subtract(bondAmount));
+                BigDecimal rewardAmount = holdOrderEntity.getRewardAmount() == null ? BigDecimal.ZERO : holdOrderEntity.getRewardAmount();
+                holdOrderEntity.setRewardAmount(rewardAmount.add(profitOrLoss));
                 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