From 237d0b600b55ecbf3d4f241568862ae7b498e983 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 31 Aug 2020 18:51:12 +0800
Subject: [PATCH] modify entrsut open order when more/less/bomb/entrustClose
---
src/main/java/com/xcong/excoin/rabbit/init/OrderProducerInit.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
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 94d6e76..f184fea 100644
--- a/src/main/java/com/xcong/excoin/rabbit/init/OrderProducerInit.java
+++ b/src/main/java/com/xcong/excoin/rabbit/init/OrderProducerInit.java
@@ -69,7 +69,7 @@
if (forceSetPrice != null) {
if (forceSetPrice.compareTo(BigDecimal.ZERO) >= 0) {
OrderModel model = new OrderModel(order.getId(), RabbitPriceTypeEnum.CLOSE_MORE_BOMB.getValue(), forceSetPrice.toPlainString(),
- order.getSymbol(), order.getOperateNo());
+ order.getSymbol(), order.getOperateNo(), order.getMemberId());
producer.sendPriceOperate(JSONObject.toJSONString(model));
}
}
@@ -79,7 +79,7 @@
if (stopLossPrice != null && stopLossPrice.compareTo(BigDecimal.ZERO) > 0) {
OrderModel model = new OrderModel(order.getId(), RabbitPriceTypeEnum.CLOSE_MORE_STOP_LESS.getValue(),
stopLossPrice.setScale(8, RoundingMode.HALF_UP).toPlainString(),
- order.getSymbol());
+ order.getSymbol(), order.getMemberId());
producer.sendPriceOperate(JSONObject.toJSONString(model));
}
// 止盈
@@ -87,7 +87,7 @@
if (stopProfitPrice != null && stopProfitPrice.compareTo(BigDecimal.ZERO) > 0) {
OrderModel model = new OrderModel(order.getId(), RabbitPriceTypeEnum.CLOSE_MORE_STOP_PROFIT.getValue(),
stopProfitPrice.setScale(8, RoundingMode.HALF_UP).toPlainString(),
- order.getSymbol());
+ order.getSymbol(), order.getMemberId());
producer.sendPriceOperate(JSONObject.toJSONString(model));
}
@@ -99,7 +99,7 @@
if (forceSetPrice != null) {
if (forceSetPrice.compareTo(BigDecimal.ZERO) >= 0) {
OrderModel model = new OrderModel(order.getId(), RabbitPriceTypeEnum.CLOSE_LESS_BOMB.getValue(), forceSetPrice.toPlainString(),
- order.getSymbol(), order.getOperateNo());
+ order.getSymbol(), order.getOperateNo(), order.getMemberId());
producer.sendPriceOperate(JSONObject.toJSONString(model));
}
}
@@ -109,7 +109,7 @@
if (stopLossPrice != null && stopLossPrice.compareTo(BigDecimal.ZERO) > 0) {
OrderModel model = new OrderModel(order.getId(), RabbitPriceTypeEnum.CLOSE_LESS_STOP_LESS.getValue(),
stopLossPrice.setScale(8, RoundingMode.HALF_UP).toPlainString(),
- order.getSymbol());
+ order.getSymbol(), order.getMemberId());
producer.sendPriceOperate(JSONObject.toJSONString(model));
}
// 止盈
@@ -117,7 +117,7 @@
if (stopProfitPrice != null && stopProfitPrice.compareTo(BigDecimal.ZERO) > 0) {
OrderModel model = new OrderModel(order.getId(), RabbitPriceTypeEnum.CLOSE_LESS_STOP_PROFIT.getValue(),
stopProfitPrice.setScale(8, RoundingMode.HALF_UP).toPlainString(),
- order.getSymbol());
+ order.getSymbol(), order.getMemberId());
producer.sendPriceOperate(JSONObject.toJSONString(model));
}
}
@@ -151,20 +151,20 @@
// 开多委托
model = new OrderModel(order.getId(), RabbitPriceTypeEnum.ENTRUST_OPEN_MORE.getValue(),
entrustPrice.setScale(8, RoundingMode.HALF_UP).toPlainString(),
- order.getSymbol());
+ order.getSymbol(), order.getMemberId());
} else if (ContractEntrustOrderEntity.ENTRUST_TYPE_OPEN_LESS == entrustType){
model = new OrderModel(order.getId(), RabbitPriceTypeEnum.ENTRUST_OPEN_LESS.getValue(),
entrustPrice.setScale(8, RoundingMode.HALF_UP).toPlainString(),
- order.getSymbol());
+ order.getSymbol(), order.getMemberId());
} else if (ContractEntrustOrderEntity.ENTRUST_TYPE_CLOSE_MORE == entrustType) {
model = new OrderModel(order.getId(), RabbitPriceTypeEnum.ENTRUST_CLOSE_MORE.getValue(),
entrustPrice.setScale(8, RoundingMode.HALF_UP).toPlainString(),
- order.getSymbol());
+ order.getSymbol(), order.getMemberId());
} else {
model = new OrderModel(order.getId(), RabbitPriceTypeEnum.ENTRUST_CLOSE_LESS.getValue(),
entrustPrice.setScale(8, RoundingMode.HALF_UP).toPlainString(),
- order.getSymbol());
+ order.getSymbol(), order.getMemberId());
}
producer.sendPriceOperate(JSONObject.toJSONString(model));
}
--
Gitblit v1.9.1