From 38c8e4e9cccfead01002c6c20df6b9d5dd4a0b81 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 19 Aug 2020 16:34:02 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java | 7 +------
1 files changed, 1 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 966c059..6d03d29 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,7 +255,6 @@
* 全仓模式平仓逻辑
*/
public void closingWholeOrder(ContractHoldOrderEntity holdOrderEntity) {
- log.info("进入全仓模式--平仓");
String symbol = holdOrderEntity.getSymbol();
// 获取最新价
BigDecimal newPrice = new BigDecimal(redisUtils.getString(CoinTypeConvert.convertToKey(symbol)));
@@ -267,7 +263,6 @@
MemberWalletContractEntity walletContract = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(holdOrderEntity.getMemberId(), CoinTypeEnum.USDT.name());
if (walletContract != null) {
- log.info("--->逻辑");
BigDecimal lotNumber = cacheSettingUtils.getSymbolSku(symbol);
// 盈亏
BigDecimal profitOrLoss = BigDecimal.ZERO;
@@ -331,7 +326,7 @@
BigDecimal changeAmount = profitOrLoss.add(bondAmount).subtract(fee);
- 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