From 1ce12b18158af59d457e87a7549a46c91b9c133a Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 26 Aug 2020 19:40:25 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java | 2 +-
src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderListVo.java | 3 +++
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderListVo.java b/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderListVo.java
index 7a6d2bd..0e924ca 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderListVo.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderListVo.java
@@ -47,6 +47,9 @@
@ApiModelProperty(value = "张数")
private int symbolCnt;
+ @ApiModelProperty(value = "可平张数")
+ private int symbolCntSale;
+
@ApiModelProperty(value = "回报率")
private BigDecimal returnRate;
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 624dc75..22ee611 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
@@ -302,7 +302,7 @@
log.info("bondAmount:{}", bondAmount);
// 平仓手续费 TODO 可能需要修复手续费
BigDecimal fee = BigDecimal.ZERO;
- log.info("sysmbolCnt : {}", holdOrderEntity.getSymbolCnt());
+
if (holdOrderEntity.getSymbolCnt() != 0) {
fee = holdOrderEntity.getOpeningFeeAmount().divide(BigDecimal.valueOf(holdOrderEntity.getSymbolCnt()), 8, BigDecimal.ROUND_DOWN).multiply(BigDecimal.valueOf(closeCnt));
} else {
--
Gitblit v1.9.1