From c611dbf70f2af43b69ece998622a503e1723197f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 05 Jun 2020 17:42:12 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 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 c103753..681a557 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
@@ -133,14 +133,15 @@
contractOrderEntity.setRewardRatio(rewardRatio);
contractOrderDao.insert(contractOrderEntity);
+ log.info("盈亏:{}", profitOrLoss);
+ log.info("手续费:{}", holdOrderEntity.getOpeningFeeAmount());
+ log.info("保证金:{}", holdOrderEntity.getBondAmount());
// 计算盈利或亏损后可用金额和总金额应该增加或减少的
- BigDecimal addMoney = holdOrderEntity.getBondAmount().subtract(holdOrderEntity.getOpeningPrice()).add(profitOrLoss);
- log.info("平仓增加金额:{}", addMoney);
+ BigDecimal addMoney = holdOrderEntity.getBondAmount().subtract(holdOrderEntity.getOpeningFeeAmount()).add(profitOrLoss);
+ log.info("金额:{}", addMoney);
+ log.info("----->:{}", contractOrderEntity.getOpeningFeeAmount());
- walletContract.setFrozenBalance(walletContract.getFrozenBalance().subtract(holdOrderEntity.getBondAmount()));
- walletContract.setAvailableBalance(walletContract.getAvailableBalance().add(addMoney));
- walletContract.setTotalBalance(walletContract.getTotalBalance().add(addMoney));
-
+ memberWalletContractDao.increaseWalletContractBalanceById(addMoney, profitOrLoss.subtract(contractOrderEntity.getOpeningFeeAmount()), null, walletContract.getId());
// 计算佣金
ThreadPoolUtils.calReturnMoney(memberEntity.getId(), contractOrderEntity.getClosingFeeAmount(), contractOrderEntity, AgentReturnEntity.ORDER_TYPE_CLOSE);
}
--
Gitblit v1.9.1