From 69e40a4445dd4f73c9b04de52f6a6d04d66127b7 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 19 Aug 2020 17:42:59 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 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 fe49e0a..48a7aec 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
@@ -303,8 +303,13 @@
BigDecimal bondAmount = CalculateUtil.getBondAmount(holdOrderEntity.getOpeningPrice(), lotNumber, closeCnt, holdOrderEntity.getLeverRatio());
log.info("bondAmount:{}", bondAmount);
- // 平仓手续费
- BigDecimal fee = holdOrderEntity.getOpeningFeeAmount().divide(BigDecimal.valueOf(holdOrderEntity.getSymbolCnt()), 8, BigDecimal.ROUND_DOWN).multiply(BigDecimal.valueOf(closeCnt));
+ // 平仓手续费 TODO 可能需要修复手续费
+ BigDecimal fee = BigDecimal.ZERO;
+ if (holdOrderEntity.getSymbolCnt() != 0) {
+ fee = holdOrderEntity.getOpeningFeeAmount().divide(BigDecimal.valueOf(holdOrderEntity.getSymbolCnt()), 8, BigDecimal.ROUND_DOWN).multiply(BigDecimal.valueOf(closeCnt));
+ } else {
+ fee = holdOrderEntity.getOpeningFeeAmount();
+ }
log.info("fee:{}", fee);
ContractOrderEntity contractOrderEntity = ContractHoldOrderEntityMapper.INSTANCE.holdOrderToOrder(holdOrderEntity);
contractOrderEntity.setId(null);
@@ -318,6 +323,7 @@
contractOrderDao.insert(contractOrderEntity);
if (holdOrderEntity.getSymbolCntSale() != 0) {
+ holdOrderEntity.setOpeningFeeAmount(holdOrderEntity.getOpeningFeeAmount().subtract(fee));
contractHoldOrderDao.updateById(holdOrderEntity);
} else {
contractHoldOrderDao.deleteById(holdOrderEntity.getId());
--
Gitblit v1.9.1