From 269d4bfcf2445076235c8c276f6202382527f741 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 23 Sep 2020 11:44:19 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/rabbit/init/OrderProducerInit.java | 24 ++++++++++++++----------
1 files changed, 14 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..bdca53a 100644
--- a/src/main/java/com/xcong/excoin/rabbit/init/OrderProducerInit.java
+++ b/src/main/java/com/xcong/excoin/rabbit/init/OrderProducerInit.java
@@ -12,10 +12,12 @@
import com.xcong.excoin.rabbit.pricequeue.OrderModel;
import com.xcong.excoin.rabbit.producer.OrderProducer;
import com.xcong.excoin.utils.CalculateUtil;
+import com.xcong.excoin.utils.ThreadPoolUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.DependsOn;
import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
@@ -31,6 +33,7 @@
* @author helius
*/
@Slf4j
+@DependsOn("springContextHolder")
@Component
@ConditionalOnProperty(prefix = "app", name = "newest-price-update-job", havingValue = "true")
public class OrderProducerInit {
@@ -69,7 +72,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 +82,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 +90,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 +102,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 +112,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 +120,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));
}
}
@@ -136,6 +139,7 @@
memberEntity = memberDao.selectById(memberId);
}
+// ThreadPoolUtils.sendWholeForceClosingPrice(symbol, memberEntity);
CalculateUtil.getForceSetPriceForWhole(symbol, memberEntity);
}
}
@@ -151,20 +155,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