From ed56b5319b5612c64a2f60e2f3c35c41d1efb502 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 19 Aug 2020 17:23:45 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java | 11 ++---------
1 files changed, 2 insertions(+), 9 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 7b30a9f..fe49e0a 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,15 +89,11 @@
@Transactional(rollbackFor = Exception.class)
@Override
public void cancelHoldOrder(List<Long> ids) {
- log.info("--------");
if (CollUtil.isNotEmpty(ids)) {
try {
- log.info("=========:{}", ids.size());
if (ids.size() == 1) {
- log.info("------->>>>>>");
ContractHoldOrderEntity holdOrderEntity = contractHoldOrderDao.selectById(ids.get(0));
- log.info(">>>>>>>>>>>>>{}", holdOrderEntity.getPositionType());
// 判断仓位类型是否逐仓
if (holdOrderEntity.getPositionType() == ContractEntrustOrderEntity.POSITION_TYPE_ADD) {
// 逐仓平仓
@@ -259,7 +255,6 @@
* 全仓模式平仓逻辑
*/
public void closingWholeOrder(ContractHoldOrderEntity holdOrderEntity) {
- log.info("进入全仓模式--平仓");
String symbol = holdOrderEntity.getSymbol();
// 获取最新价
BigDecimal newPrice = new BigDecimal(redisUtils.getString(CoinTypeConvert.convertToKey(symbol)));
@@ -268,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;
@@ -323,8 +317,7 @@
contractOrderEntity.setClosingFeeAmount(fee);
contractOrderDao.insert(contractOrderEntity);
- if (holdOrderEntity.getSymbolCntSale() - closeCnt != 0) {
- holdOrderEntity.setSymbolCntSale(holdOrderEntity.getSymbolCntSale() - closeCnt);
+ if (holdOrderEntity.getSymbolCntSale() != 0) {
contractHoldOrderDao.updateById(holdOrderEntity);
} else {
contractHoldOrderDao.deleteById(holdOrderEntity.getId());
@@ -332,7 +325,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