From 169cb4d146f9e429b25d32cb8a9edac469609b1f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 26 Aug 2020 14:49:17 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractEntrustOrderServiceImpl.java | 39 ++++++++++++++++++++++-----------------
1 files changed, 22 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 97b8a07..10db7db 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
@@ -251,7 +251,12 @@
return Result.fail(MessageSourceUtils.getString("entrust_order_not_exist"));
}
- MemberWalletContractEntity walletContractEntity = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(memberEntity.getId(), MemberWalletCoinEnum.WALLETCOINCODE.getValue());
+ MemberWalletContractEntity walletContractEntity;
+ if (ContractEntrustOrderEntity.POSITION_TYPE_ADD == entrustOrderEntity.getPositionType()) {
+ walletContractEntity = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(memberEntity.getId(), MemberWalletCoinEnum.WALLETCOINCODE.getValue());
+ } else {
+ walletContractEntity = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(memberEntity.getId(), CoinTypeConvert.convertContractTypeToCoin(entrustOrderEntity.getSymbol()));
+ }
BigDecimal total = entrustOrderEntity.getEntrustAmount();
memberWalletContractDao.increaseWalletContractBalanceById(total, null, entrustOrderEntity.getBondAmount().negate(), walletContractEntity.getId());
@@ -289,27 +294,27 @@
}
// 获取最新价
- BigDecimal newPrice = new BigDecimal(redisUtils.getString(CoinTypeConvert.convertToKey(submitCloseEntrustDto.getSymbol())));
+ BigDecimal newPrice = new BigDecimal(redisUtils.getString(CoinTypeConvert.convertToKey(holdOrderEntity.getSymbol())));
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;
}
@@ -317,7 +322,7 @@
MemberWalletContractEntity walletContract = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(member.getId(), CoinTypeConvert.convertContractTypeToCoin(holdOrderEntity.getSymbol()));
- BigDecimal lotNumber = cacheSettingUtils.getSymbolSku(submitCloseEntrustDto.getSymbol());
+ BigDecimal lotNumber = cacheSettingUtils.getSymbolSku(holdOrderEntity.getSymbol());
BigDecimal bondAmount = CalculateUtil.getBondAmount(holdOrderEntity.getOpeningPrice(), lotNumber, submitCloseEntrustDto.getSymbolCnt(), holdOrderEntity.getLeverRatio());
ContractEntrustOrderEntity entrustOrder = new ContractEntrustOrderEntity();
@@ -338,10 +343,10 @@
if (i > 0) {
// 发送委托消息
if (holdOrderEntity.getOpeningType() == ContractEntrustOrderEntity.ENTRUST_TYPE_OPEN_MORE) {
- OrderModel model = new OrderModel(holdOrderEntity.getId(), RabbitPriceTypeEnum.ENTRUST_OPEN_MORE.getValue(), submitCloseEntrustDto.getEntrustPrice().setScale(8, RoundingMode.HALF_UP).toPlainString(), holdOrderEntity.getSymbol());
+ OrderModel model = new OrderModel(holdOrderEntity.getId(), RabbitPriceTypeEnum.ENTRUST_CLOSE_MORE.getValue(), submitCloseEntrustDto.getEntrustPrice().setScale(8, RoundingMode.HALF_UP).toPlainString(), holdOrderEntity.getSymbol());
producer.sendPriceOperate(JSONObject.toJSONString(model));
} else {
- OrderModel model = new OrderModel(holdOrderEntity.getId(), RabbitPriceTypeEnum.ENTRUST_OPEN_LESS.getValue(), submitCloseEntrustDto.getEntrustPrice().setScale(8, RoundingMode.HALF_UP).toPlainString(), holdOrderEntity.getSymbol());
+ OrderModel model = new OrderModel(holdOrderEntity.getId(), RabbitPriceTypeEnum.ENTRUST_CLOSE_LESS.getValue(), submitCloseEntrustDto.getEntrustPrice().setScale(8, RoundingMode.HALF_UP).toPlainString(), holdOrderEntity.getSymbol());
producer.sendPriceOperate(JSONObject.toJSONString(model));
}
}
--
Gitblit v1.9.1