From 95da7870f87ec42dbd572aba040492c881fe0b9c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 05 Jun 2020 15:35:21 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin.git

---
 src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java |    2 +-
 1 files changed, 1 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 9cc6764..fdbcec5 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
@@ -617,9 +617,9 @@
 
                     //更新主表订单状态位为“已平仓”
                     contractOrderEntity.setId(null);
-                    contractOrderEntity.setClosingPrice(BigDecimal.ZERO);
                     contractOrderEntity.setClosingPrice(nowPrice);
                     contractOrderEntity.setClosingTime(new Date());
+                    contractOrderEntity.setClosingFeeAmount(coinsOrder.getOpeningFeeAmount());
                     contractOrderEntity.setRewardAmount(coinsOrder.getBondAmount().subtract(contractOrderEntity.getOpeningFeeAmount()).negate());
                     contractOrderService.save(contractOrderEntity);
 

--
Gitblit v1.9.1