From 1c4cd7d4de706f6ee6d3bd435b084ea89999bf71 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 19 Aug 2020 17:14:36 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java | 2 +-
src/main/java/com/xcong/excoin/rabbit/init/OrderProducerInit.java | 8 +++++---
src/main/java/com/xcong/excoin/utils/CalculateUtil.java | 2 +-
3 files changed, 7 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 d29143d..b4fc7c8 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
@@ -572,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 6b78a59..ad8f3e0 100644
--- a/src/main/java/com/xcong/excoin/rabbit/init/OrderProducerInit.java
+++ b/src/main/java/com/xcong/excoin/rabbit/init/OrderProducerInit.java
@@ -87,9 +87,11 @@
// 爆仓价
BigDecimal forceSetPrice = order.getForceClosingPrice();
if (forceSetPrice != null) {
- OrderModel model = new OrderModel(order.getId(), RabbitPriceTypeEnum.CLOSE_LESS_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_LESS_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 5b4a8cd..841beee 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