From bef3b23ca8918a355f6ff9751b46f4c35970f19e Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Sun, 25 Oct 2020 14:09:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/whole' into whole

---
 src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java b/src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java
index c6d461b..a0ef098 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java
@@ -637,6 +637,7 @@
                 contractHoldOrderEntity.setOpeningPrice(entrustPrice);
                 contractHoldOrderEntity.setTradeType(ContractHoldOrderEntity.TRADE_TYPE_LIMIT);
                 contractHoldOrderEntity.setOperateNo(1);
+                contractHoldOrderEntity.setSymbolCntSale(contractHoldOrderEntity.getSymbolCnt());
                 contractHoldOrderService.save(contractHoldOrderEntity);
 
                 // 需要一个历史插入
@@ -710,7 +711,7 @@
             }
 
             holdOrderEntity.setTradeType(ContractHoldOrderEntity.TRADE_TYPE_LIMIT);
-            holdOrderEntity.setSymbolCntSale(holdOrderEntity.getSymbolCnt());
+            holdOrderEntity.setSymbolCntSale(entrustOrder.getSymbolCnt());
             holdOrderEntity.setOpeningFeeAmount(openFeePrice);
             holdOrderEntity.setOpeningPrice(entrustOrder.getEntrustPrice());
             holdOrderEntity.setMarkPrice(entrustOrder.getEntrustPrice());

--
Gitblit v1.9.1