From 85e7a8b06e921c81b0ed17ec8f181cfb16e298fb Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 29 Jan 2021 11:21:28 +0800
Subject: [PATCH] modify

---
 src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java |    5 ++---
 1 files changed, 2 insertions(+), 3 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 c2011f0..b2fd665 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
@@ -500,9 +500,9 @@
 
                 BigDecimal rewardRatio = holdOrderDataModel.getRewardAmount().divide(holdOrderEntity.getBondAmount().subtract(holdOrderEntity.getOpeningFeeAmount()), 8, BigDecimal.ROUND_DOWN);
                 contractOrderEntity.setRewardRatio(rewardRatio);
-                contractOrderEntity.setRewardAmount(holdOrderDataModel.getRewardAmount());
+                contractOrderEntity.setRewardAmount(holdOrderDataModel.getRewardAmount().add(contractOrderEntity.getBondAmount().negate()));
                 contractOrderEntity.setClosingPrice(holdOrderDataModel.getClosingPrice());
-                contractOrderEntity.setForceClosingPrice(holdOrderDataModel.getClosingPrice());
+//                contractOrderEntity.setForceClosingPrice(holdOrderDataModel.getClosingPrice());
 
                 // 订单状态转换
                 if (ContractOrderEntity.ORDER_TYPE_OPEN_MORE == contractOrderEntity.getOrderType()) {
@@ -511,7 +511,6 @@
                     contractOrderEntity.setOrderType(ContractOrderEntity.ORDER_TYPE_CLOSE_LESS);
                 }
                 contractOrderEntity.setClosingTime(new Date());
-                contractOrderEntity.setClosingFeeAmount(holdOrderEntity.getOpeningFeeAmount());
 
                 contractOrderDao.insert(contractOrderEntity);
             }

--
Gitblit v1.9.1