From adb99db2cb5359416713a1bd3a13423ddf0f0d80 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 25 Aug 2020 19:26:46 +0800
Subject: [PATCH] modify whole close order
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 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 966c059..8cfa416 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
@@ -89,14 +89,11 @@
@Transactional(rollbackFor = Exception.class)
@Override
public void cancelHoldOrder(List<Long> ids) {
- log.info("--------");
if (CollUtil.isNotEmpty(ids)) {
- log.info("=========");
try {
if (ids.size() == 1) {
ContractHoldOrderEntity holdOrderEntity = contractHoldOrderDao.selectById(ids.get(0));
- log.info(">>>>>>>>>>>>>{}", holdOrderEntity.getPositionType());
// 判断仓位类型是否逐仓
if (holdOrderEntity.getPositionType() == ContractEntrustOrderEntity.POSITION_TYPE_ADD) {
// 逐仓平仓
@@ -258,16 +255,14 @@
* 全仓模式平仓逻辑
*/
public void closingWholeOrder(ContractHoldOrderEntity holdOrderEntity) {
- log.info("进入全仓模式--平仓");
String symbol = holdOrderEntity.getSymbol();
// 获取最新价
BigDecimal newPrice = new BigDecimal(redisUtils.getString(CoinTypeConvert.convertToKey(symbol)));
MemberEntity memberEntity = memberDao.selectById(holdOrderEntity.getMemberId());
- MemberWalletContractEntity walletContract = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(holdOrderEntity.getMemberId(), CoinTypeEnum.USDT.name());
+ MemberWalletContractEntity walletContract = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(holdOrderEntity.getMemberId(), CoinTypeConvert.convertContractTypeToCoin(symbol));
if (walletContract != null) {
- log.info("--->逻辑");
BigDecimal lotNumber = cacheSettingUtils.getSymbolSku(symbol);
// 盈亏
BigDecimal profitOrLoss = BigDecimal.ZERO;
@@ -308,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);
@@ -322,16 +322,17 @@
contractOrderEntity.setClosingFeeAmount(fee);
contractOrderDao.insert(contractOrderEntity);
- if (holdOrderEntity.getSymbolCntSale() - closeCnt != 0) {
- holdOrderEntity.setSymbolCntSale(holdOrderEntity.getSymbolCntSale() - closeCnt);
+ 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).subtract(fee);
+ BigDecimal changeAmount = profitOrLoss.add(bondAmount);
- memberWalletContractDao.increaseWalletContractBalanceById(changeAmount, fee.negate(), null, walletContract.getId());
+ memberWalletContractDao.increaseWalletContractBalanceById(changeAmount, profitOrLoss.subtract(fee), null, walletContract.getId());
ThreadPoolUtils.sendWholeForceClosingPrice(holdOrderEntity.getSymbol(), memberEntity);
// 计算佣金
--
Gitblit v1.9.1