From cbbcf3acec4c22abe18b8be4c4cda27a47317bf8 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 26 Aug 2020 19:35:06 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java b/src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java
index bec0bef..c92ab72 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java
@@ -614,9 +614,10 @@
// 手续费
BigDecimal openFeePrice = CalculateUtil.getOpenFeePrice(entrustOrder.getEntrustPrice(), entrustOrder.getSymbolSku(), entrustOrder.getSymbolCnt(), tradeSettingEntity.getFeeRatio());
- ContractHoldOrderEntity wholeHoldOrder = contractHoldOrderDao.selectWholeHoldOrderByOrderType(entrustOrder.getMemberId(), entrustOrder.getEntrustType());
+ ContractHoldOrderEntity wholeHoldOrder = contractHoldOrderDao.selectWholeHoldOrderByOrderType(entrustOrder.getMemberId(), entrustOrder.getEntrustType(), entrustOrder.getSymbol());
// 判断持仓是否存在，若不存在则创建新的持仓订单
if (wholeHoldOrder == null) {
+ log.info("持仓不存在");
ContractHoldOrderEntity holdOrderEntity = ContractEntrustOrderEntityMapper.INSTANCE.entrustOrderToHoldOrder(entrustOrder);
int type = entrustOrder.getEntrustType();
@@ -658,6 +659,7 @@
return;
}
+ log.info("持仓存在");
ContractOrderEntity contractOrderEntity = ContractHoldOrderEntityMapper.INSTANCE.holdOrderToOrder(wholeHoldOrder);
contractOrderEntity.setBondAmount(entrustOrder.getBondAmount().add(openFeePrice));
contractOrderEntity.setOpeningPrice(entrustOrder.getEntrustPrice());
@@ -683,7 +685,7 @@
wholeHoldOrder.setBondAmount(wholeHoldOrder.getBondAmount().add(bondAmount));
wholeHoldOrder.setPrePaymentAmount(prePaymentAmount);
wholeHoldOrder.setOperateNo(wholeHoldOrder.getOperateNo() + 1);
- contractHoldOrderService.save(wholeHoldOrder);
+ contractHoldOrderService.updateById(wholeHoldOrder);
contractEntrustOrderService.removeById(entrustOrder.getId());
memberWalletContractService.increaseWalletContractBalanceById(null, openFeePrice.negate(), entrustOrder.getBondAmount().negate(), wallet.getId());
--
Gitblit v1.9.1