From 57503ccf929581c8ecc3554c31de8d30110b7f66 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 26 Aug 2020 15:42:29 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractEntrustOrderServiceImpl.java | 36 +++++++++++++++++++-----------------
1 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractEntrustOrderServiceImpl.java b/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractEntrustOrderServiceImpl.java
index ca87cc2..317e73d 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractEntrustOrderServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractEntrustOrderServiceImpl.java
@@ -255,12 +255,15 @@
MemberWalletContractEntity walletContractEntity;
if (ContractEntrustOrderEntity.POSITION_TYPE_ADD == entrustOrderEntity.getPositionType()) {
walletContractEntity = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(memberEntity.getId(), MemberWalletCoinEnum.WALLETCOINCODE.getValue());
+
+ BigDecimal total = entrustOrderEntity.getEntrustAmount();
+ memberWalletContractDao.increaseWalletContractBalanceById(total, null, entrustOrderEntity.getBondAmount().negate(), walletContractEntity.getId());
+
+ // 插入财务流水
+ LogRecordUtils.insertMemberAccountFlow(memberEntity.getId(), total, walletContractEntity.getAvailableBalance().add(total), entrustOrderEntity.getSymbol(), "撤销委托单", "撤销委托单");
} else {
walletContractEntity = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(memberEntity.getId(), CoinTypeConvert.convertContractTypeToCoin(entrustOrderEntity.getSymbol()));
}
-
- BigDecimal total = entrustOrderEntity.getEntrustAmount();
- memberWalletContractDao.increaseWalletContractBalanceById(total, null, entrustOrderEntity.getBondAmount().negate(), walletContractEntity.getId());
ContractOrderEntity orderEntity = ContractEntrustOrderEntityMapper.INSTANCE.entrustOrderToOrder(entrustOrderEntity);
orderEntity.setTradeType(ContractOrderEntity.TRADE_TYPE_MARK_PRICE);
@@ -269,8 +272,6 @@
contractEntrustOrderDao.deleteById(entrustOrderEntity.getId());
- // 插入财务流水
- LogRecordUtils.insertMemberAccountFlow(memberEntity.getId(), total, walletContractEntity.getAvailableBalance().add(total), entrustOrderEntity.getSymbol(), "撤销委托单", "撤销委托单");
if (i > 0) {
return Result.ok(MessageSourceUtils.getString("cancellation_success"));
}
@@ -314,22 +315,22 @@
int closeType;
if (holdOrderEntity.getOpeningType() == ContractHoldOrderEntity.OPENING_TYPE_MORE) {
// 开多, 若委托价低于当前价则立即成交
-// if (submitCloseEntrustDto.getEntrustPrice().compareTo(newPrice) <= 0) {
-// WholeCloseOrderDto wholeCloseOrderDto = new WholeCloseOrderDto();
-// wholeCloseOrderDto.setCount(submitCloseEntrustDto.getSymbolCnt());
-// wholeCloseOrderDto.setId(submitCloseEntrustDto.getId());
-// return contractHoldOrderService.cancelHoldOrder(wholeCloseOrderDto);
-// }
+ if (submitCloseEntrustDto.getEntrustPrice().compareTo(newPrice) <= 0) {
+ WholeCloseOrderDto wholeCloseOrderDto = new WholeCloseOrderDto();
+ wholeCloseOrderDto.setCount(submitCloseEntrustDto.getSymbolCnt());
+ wholeCloseOrderDto.setId(submitCloseEntrustDto.getId());
+ return contractHoldOrderService.cancelHoldOrder(wholeCloseOrderDto);
+ }
closeType = ContractOrderEntity.ORDER_TYPE_CLOSE_MORE;
} else {
// 开空, 若委托价高于当前价则立即成交
-// if (submitCloseEntrustDto.getEntrustPrice().compareTo(newPrice) >= 0) {
-// WholeCloseOrderDto wholeCloseOrderDto = new WholeCloseOrderDto();
-// wholeCloseOrderDto.setCount(submitCloseEntrustDto.getSymbolCnt());
-// wholeCloseOrderDto.setId(submitCloseEntrustDto.getId());
-// return contractHoldOrderService.cancelHoldOrder(wholeCloseOrderDto);
-// }
+ if (submitCloseEntrustDto.getEntrustPrice().compareTo(newPrice) >= 0) {
+ WholeCloseOrderDto wholeCloseOrderDto = new WholeCloseOrderDto();
+ wholeCloseOrderDto.setCount(submitCloseEntrustDto.getSymbolCnt());
+ wholeCloseOrderDto.setId(submitCloseEntrustDto.getId());
+ return contractHoldOrderService.cancelHoldOrder(wholeCloseOrderDto);
+ }
closeType = ContractOrderEntity.ORDER_TYPE_CLOSE_LESS;
}
@@ -343,6 +344,7 @@
ContractEntrustOrderEntity entrustOrder = new ContractEntrustOrderEntity();
entrustOrder.setOrderNo(holdOrderEntity.getOrderNo());
entrustOrder.setEntrustAmount(bondAmount);
+ entrustOrder.setBondAmount(bondAmount);
entrustOrder.setPositionType(ContractEntrustOrderEntity.POSITION_TYPE_ALL);
entrustOrder.setMemberId(member.getId());
entrustOrder.setEntrustPrice(submitCloseEntrustDto.getEntrustPrice());
--
Gitblit v1.9.1