From def723a6fa9cbe05734afe9011a6f90d2fa32196 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 03 Jun 2020 17:07:23 +0800
Subject: [PATCH] interface tiaozheng

---
 src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java b/src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java
index f3be1f7..55f45ef 100644
--- a/src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java
@@ -169,7 +169,7 @@
 				return Result.fail(MessageSourceUtils.getString("order_service_0009"));
 			}
 			// 手续费用(手续费=建仓价X数量X手续费率)
-			BigDecimal closingPrice = price.multiply(amount).multiply(new BigDecimal(MemberWalletCoinEnum.SUBMITSALESWALLETCOINORDER_SERVICERATE.getValue()));
+			BigDecimal closingPrice = price.multiply(amount).multiply(tradeSetting.getCoinFeeRatio());
 			//总费用 = 成交价*数量+手续费
 			BigDecimal totalPayPrice = price.multiply(amount).add(closingPrice);
 			
@@ -254,6 +254,7 @@
 				detail.setDealPrice(price.setScale(4, BigDecimal.ROUND_DOWN));
 				detail.setDealAmount(totalPayPrice.setScale(4, BigDecimal.ROUND_DOWN));
 				detail.setFeeAmount(closingPrice.setScale(4, BigDecimal.ROUND_DOWN));
+				detail.setOrderStatus(OrderCoinsDealEntity.ORDERSTATUS_DONE);
 				orderCoinDealDao.insert(detail);
 				
 				if(OrderCoinsEntity.ORDERTYPE_BUY.equals(type)) {

--
Gitblit v1.9.1