From 3129b41924bf541e5157ee30ceaf70ee5496f30e Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 19 Aug 2020 17:08:34 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java | 3 ++-
src/main/java/com/xcong/excoin/rabbit/init/OrderProducerInit.java | 8 +++++---
src/main/java/com/xcong/excoin/utils/CalculateUtil.java | 2 +-
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java b/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java
index cc77bc4..d29143d 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java
@@ -556,6 +556,7 @@
return Result.fail("可平张数不足");
}
+ log.info("--->{},{}", holdOrderEntity.getSymbolCntSale(), wholeCloseOrderDto.getCount());
// 判断当前持仓张数是否等于平仓张数，若等于则直接更新该订单为不可平状态，否则更新可平张数
if (wholeCloseOrderDto.getCount() == holdOrderEntity.getSymbolCntSale()) {
contractHoldOrderDao.updateHoldOrderIsCanClosingById(ContractHoldOrderEntity.ORDER_CAN_CLOSING_N, wholeCloseOrderDto.getId());
@@ -571,7 +572,7 @@
// 发送平仓消息
List<Long> ids = new ArrayList<>();
ids.add(wholeCloseOrderDto.getId());
- producer.sendCloseTrade(JSONObject.toJSONString(ids));
+// producer.sendCloseTrade(JSONObject.toJSONString(ids));
// 平仓成功
return Result.ok(MessageSourceUtils.getString("order_service_0044"));
diff --git a/src/main/java/com/xcong/excoin/rabbit/init/OrderProducerInit.java b/src/main/java/com/xcong/excoin/rabbit/init/OrderProducerInit.java
index 25638d8..6b78a59 100644
--- a/src/main/java/com/xcong/excoin/rabbit/init/OrderProducerInit.java
+++ b/src/main/java/com/xcong/excoin/rabbit/init/OrderProducerInit.java
@@ -59,9 +59,11 @@
// 爆仓价
BigDecimal forceSetPrice = order.getForceClosingPrice();
if (forceSetPrice != null) {
- OrderModel model = new OrderModel(order.getId(), RabbitPriceTypeEnum.CLOSE_MORE_BOMB.getValue(), forceSetPrice.toPlainString(),
- order.getSymbol(), order.getOperateNo());
- producer.sendPriceOperate(JSONObject.toJSONString(model));
+ if (forceSetPrice.compareTo(BigDecimal.ZERO) >= 0) {
+ OrderModel model = new OrderModel(order.getId(), RabbitPriceTypeEnum.CLOSE_MORE_BOMB.getValue(), forceSetPrice.toPlainString(),
+ order.getSymbol(), order.getOperateNo());
+ producer.sendPriceOperate(JSONObject.toJSONString(model));
+ }
}
// 止损
BigDecimal stopLossPrice = order.getStopLossPrice();
diff --git a/src/main/java/com/xcong/excoin/utils/CalculateUtil.java b/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
index 841beee..5b4a8cd 100644
--- a/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
+++ b/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
@@ -146,7 +146,7 @@
holdOrderDao.updateById(updateHoldOrder);
if (forceSetPrice.compareTo(BigDecimal.ZERO) >= 0) {
- sendOrderBombMsg(updateHoldOrder.getId(), updateHoldOrder.getOpeningType(), forceSetPrice, updateHoldOrder.getSymbol(), updateHoldOrder.getOperateNo());
+// sendOrderBombMsg(updateHoldOrder.getId(), updateHoldOrder.getOpeningType(), forceSetPrice, updateHoldOrder.getSymbol(), updateHoldOrder.getOperateNo());
}
}
} else {
--
Gitblit v1.9.1