From e75642b807e0382d2c1959dc83bae79deb1110d6 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Wed, 26 Aug 2020 15:31:31 +0800 Subject: [PATCH] modify --- src/main/java/com/xcong/excoin/rabbit/pricequeue/OrderOperatePriceService.java | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/xcong/excoin/rabbit/pricequeue/OrderOperatePriceService.java b/src/main/java/com/xcong/excoin/rabbit/pricequeue/OrderOperatePriceService.java index c8f559a..f37ed36 100644 --- a/src/main/java/com/xcong/excoin/rabbit/pricequeue/OrderOperatePriceService.java +++ b/src/main/java/com/xcong/excoin/rabbit/pricequeue/OrderOperatePriceService.java @@ -26,7 +26,7 @@ // 【1:买入委托2:开多3:开空4:平多5:平空6:爆仓平多7:爆仓平空8:撤单9:止盈平多10:止盈平空11:止损平多12:止损平空】 int type = orderModel.getType(); Map<String, List<OrderModel>> orderMap = PricePriorityQueue.getOrderMap(orderModel.getSymbol(), type); - if (type == 12 || type == 9 || type == 7 || type == 3) { + if (type == 12 || type == 9 || type == 7 || type == 3 || type == 4) { // 需要价格涨的 PriorityBlockingQueue<AscBigDecimal> queue = PricePriorityQueue.getQueueAsc(orderModel.getSymbol()); dealPriceAsc(orderModel, orderMap, queue); @@ -58,11 +58,11 @@ // 有这个价的key List<OrderModel> list = orderMap.get(price); // 判断这个单的这个类型是否有 - if (CollectionUtils.isNotEmpty(list)) { +// if (CollectionUtils.isNotEmpty(list)) { // 新增 OrderModel orderModel = new OrderModel(orderId, type, price, null,order.getOperateNo()); list.add(orderModel); - } +// } } else { List<OrderModel> list = new ArrayList<OrderModel>(); OrderModel orderModel = new OrderModel(orderId, type, price, null,order.getOperateNo()); @@ -93,11 +93,11 @@ // 有这个价的key List<OrderModel> list = orderMap.get(price); // 判断这个单的这个类型是否有 - if (CollectionUtils.isNotEmpty(list)) { +// if (CollectionUtils.isNotEmpty(list)) { // 新增 OrderModel orderModel = new OrderModel(orderId, type, price, null,order.getOperateNo()); list.add(orderModel); - } +// } } else { List<OrderModel> list = new ArrayList<OrderModel>(); OrderModel orderModel = new OrderModel(orderId, type, price, null,order.getOperateNo()); -- Gitblit v1.9.1