From 9c0744c43e3a796c4e68293c228d13ec02ebd2a9 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 15 Oct 2020 17:07:39 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java | 4 +++-
1 files changed, 3 insertions(+), 1 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 449dc44..9dc7fdb 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
@@ -300,6 +300,8 @@
// 保证金
BigDecimal bondAmount = CalculateUtil.getBondAmount(holdOrderEntity.getOpeningPrice(), lotNumber, closeCnt, holdOrderEntity.getLeverRatio());
+ BigDecimal rewardRatio = profitOrLoss.divide(bondAmount, 8, BigDecimal.ROUND_DOWN);
+
log.info("bondAmount:{}", bondAmount);
// 平仓手续费 TODO 可能需要修复手续费
BigDecimal fee = BigDecimal.ZERO;
@@ -376,7 +378,7 @@
log.info("执行平仓委托");
Long memberId = entrustOrder.getMemberId();
- int orderType = entrustOrder.getEntrustType() == ContractEntrustOrderEntity.ENTRUST_TYPE_CLOSE_MORE ? ContractHoldOrderEntity.OPENING_TYPE_MORE : ContractHoldOrderEntity.OPENING_TYPE_LESS;
+ int orderType = entrustOrder.getEntrustType() == ContractEntrustOrderEntity.ENTRUST_TYPE_CLOSE_MORE ? ContractOrderEntity.ORDER_TYPE_CLOSE_MORE : ContractOrderEntity.ORDER_TYPE_CLOSE_LESS;
String symbol = entrustOrder.getSymbol();
MemberEntity memberEntity = memberDao.selectById(memberId);
--
Gitblit v1.9.1