From 814b84bc20bf14c806452e91ac6154d2ff363a2b Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 27 Aug 2020 18:41:40 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java | 3 ++-
src/main/resources/mapper/contract/ContractOrderDao.xml | 7 +++++++
src/main/java/com/xcong/excoin/modules/contract/dao/ContractOrderDao.java | 2 ++
3 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/contract/dao/ContractOrderDao.java b/src/main/java/com/xcong/excoin/modules/contract/dao/ContractOrderDao.java
index 93477b3..bc69208 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/dao/ContractOrderDao.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/dao/ContractOrderDao.java
@@ -27,4 +27,6 @@
Integer selectFollowOrderCntForWinRate(@Param("memberId") Long memberId, @Param("type") Integer type);
List<ContractOrderEntity> selectWholeOpenOrderByOrderNo(@Param("orderNo") String orderNo);
+
+ BigDecimal selectWholeFeeAmountByOrderNo(@Param("orderNo") String orderNo);
}
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 8a1ca9b..9037b2c 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
@@ -304,7 +304,8 @@
BigDecimal fee = BigDecimal.ZERO;
if (holdOrderEntity.getSymbolCntSale() != 0) {
- fee = holdOrderEntity.getOpeningFeeAmount().divide(BigDecimal.valueOf(holdOrderEntity.getSymbolCnt()), 8, BigDecimal.ROUND_DOWN).multiply(BigDecimal.valueOf(closeCnt));
+ BigDecimal totalFeeAmount = contractOrderDao.selectWholeFeeAmountByOrderNo(holdOrderEntity.getOrderNo());
+ fee = totalFeeAmount.divide(BigDecimal.valueOf(holdOrderEntity.getSymbolCnt()), 8, BigDecimal.ROUND_DOWN).multiply(BigDecimal.valueOf(closeCnt));
} else {
fee = holdOrderEntity.getOpeningFeeAmount();
}
diff --git a/src/main/resources/mapper/contract/ContractOrderDao.xml b/src/main/resources/mapper/contract/ContractOrderDao.xml
index 6cc08c7..1518a66 100644
--- a/src/main/resources/mapper/contract/ContractOrderDao.xml
+++ b/src/main/resources/mapper/contract/ContractOrderDao.xml
@@ -83,4 +83,11 @@
where order_no=#{orderNo}
and order_type in (1,2) and order_status=1
</select>
+
+ <select id="selectWholeFeeAmountByOrderNo" resultType="java.math.BigDecimal">
+ select sum(opening_fee_amount)
+ from contract_order
+ where order_no=#{orderNo}
+ and order_type in (1,2) and order_status=1
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1