From f57a42e8bdab50be7d8ef11913a1957ccf92e9ef Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 27 Aug 2020 17:02:49 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java | 90 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 88 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 706dda4..c1fb604 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,8 @@
log.info("bondAmount:{}", bondAmount);
// 平仓手续费 TODO 可能需要修复手续费
BigDecimal fee = BigDecimal.ZERO;
- if (holdOrderEntity.getSymbolCnt() != 0) {
+
+ if (holdOrderEntity.getSymbolCntSale() != 0) {
fee = holdOrderEntity.getOpeningFeeAmount().divide(BigDecimal.valueOf(holdOrderEntity.getSymbolCnt()), 8, BigDecimal.ROUND_DOWN).multiply(BigDecimal.valueOf(closeCnt));
} else {
fee = holdOrderEntity.getOpeningFeeAmount();
@@ -328,8 +329,12 @@
}
BigDecimal changeAmount = profitOrLoss.add(bondAmount);
+ log.info("changeAmount : {}", changeAmount);
- memberWalletContractDao.increaseWalletContractBalanceById(changeAmount, profitOrLoss.subtract(fee), null, walletContract.getId());
+ BigDecimal total = profitOrLoss.subtract(fee);
+ log.info("totalMoney : {}", total);
+
+ memberWalletContractDao.increaseWalletContractBalanceById(changeAmount, total, null, walletContract.getId());
ThreadPoolUtils.sendWholeForceClosingPrice(holdOrderEntity.getSymbol(), memberEntity);
// 计算佣金
@@ -357,5 +362,86 @@
private void closeOrder(ContractEntrustOrderEntity entrustOrder) {
log.info("执行平仓委托");
+
+ Long memberId = entrustOrder.getMemberId();
+ int orderType = entrustOrder.getEntrustType() == ContractEntrustOrderEntity.ENTRUST_TYPE_CLOSE_MORE ? ContractHoldOrderEntity.OPENING_TYPE_MORE : ContractHoldOrderEntity.OPENING_TYPE_LESS;
+ String symbol = entrustOrder.getSymbol();
+
+ MemberEntity memberEntity = memberDao.selectById(memberId);
+ MemberWalletContractEntity walletContract = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(memberId, CoinTypeConvert.convertContractTypeToCoin(symbol));
+
+ BigDecimal lotNumber = cacheSettingUtils.getSymbolSku(symbol);
+
+ BigDecimal newPrice = entrustOrder.getEntrustPrice();
+ int closeCnt = entrustOrder.getSymbolCnt();
+
+ ContractHoldOrderEntity holdOrderEntity = contractHoldOrderDao.selectWholeHoldOrderByOrderType(memberId, orderType, symbol);
+ BigDecimal profitOrLoss;
+ int closingType;
+ // 平多
+ if (entrustOrder.getEntrustType() == ContractEntrustOrderEntity.ENTRUST_TYPE_CLOSE_MORE) {
+ profitOrLoss = newPrice.subtract(holdOrderEntity.getOpeningPrice()).multiply(lotNumber).multiply(new BigDecimal(closeCnt));
+ closingType = OrderClosingTypeEnum.CLOSE_MORE.getValue();
+
+ // 平空
+ } else {
+ profitOrLoss = newPrice.subtract(holdOrderEntity.getOpeningPrice()).multiply(lotNumber).multiply(new BigDecimal(closeCnt));
+ closingType = OrderClosingTypeEnum.CLOSE_LESS.getValue();
+ }
+
+ if (memberEntity.getIsProfit() == MemberEntity.IS_PROFIT_Y) {
+ PlatformTradeSettingEntity tradeSettingEntity = cacheSettingUtils.getTradeSetting();
+ if (profitOrLoss.compareTo(BigDecimal.ZERO) > -1) {
+ profitOrLoss = profitOrLoss.multiply(BigDecimal.ONE.subtract(tradeSettingEntity.getProfitParam()));
+ } else {
+ profitOrLoss = profitOrLoss.multiply(BigDecimal.ONE.add(tradeSettingEntity.getProfitParam()));
+ }
+ }
+ log.info("profitOrLoss:{}", profitOrLoss);
+
+ // 保证金
+ BigDecimal bondAmount = CalculateUtil.getBondAmount(holdOrderEntity.getOpeningPrice(), lotNumber, closeCnt, holdOrderEntity.getLeverRatio());
+
+ log.info("bondAmount:{}", bondAmount);
+ // 平仓手续费 TODO 可能需要修复手续费
+ BigDecimal fee = BigDecimal.ZERO;
+
+ if (holdOrderEntity.getSymbolCntSale() != 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);
+ contractOrderEntity.setClosingPrice(newPrice);
+ contractOrderEntity.setOrderType(orderType);
+ contractOrderEntity.setClosingType(closingType);
+ contractOrderEntity.setSymbolCnt(closeCnt);
+ contractOrderEntity.setRewardAmount(profitOrLoss);
+ contractOrderEntity.setBondAmount(bondAmount);
+ contractOrderEntity.setClosingFeeAmount(fee);
+ contractOrderDao.insert(contractOrderEntity);
+
+ if (holdOrderEntity.getSymbolCntSale() != 0) {
+ holdOrderEntity.setOpeningFeeAmount(holdOrderEntity.getOpeningFeeAmount().subtract(fee));
+ holdOrderEntity.setBondAmount(holdOrderEntity.getBondAmount().subtract(bondAmount));
+ contractHoldOrderDao.updateById(holdOrderEntity);
+ } else {
+ contractHoldOrderDao.deleteById(holdOrderEntity.getId());
+ }
+
+ BigDecimal changeAmount = profitOrLoss.add(bondAmount);
+ log.info("changeAmount : {}", changeAmount);
+
+ BigDecimal total = profitOrLoss.subtract(fee);
+ log.info("totalMoney : {}", total);
+
+ memberWalletContractDao.increaseWalletContractBalanceById(changeAmount, total, null, walletContract.getId());
+
+ ThreadPoolUtils.sendWholeForceClosingPrice(holdOrderEntity.getSymbol(), memberEntity);
+ // 计算佣金
+ ThreadPoolUtils.calReturnMoney(memberEntity.getId(), fee, contractOrderEntity, AgentReturnEntity.ORDER_TYPE_CLOSE);
}
}
--
Gitblit v1.9.1