From 1fc98d66589965b5b10e09334f715b28ed5ab455 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Tue, 08 Sep 2020 10:33:47 +0800 Subject: [PATCH] modify --- src/main/java/com/xcong/excoin/rabbit/pricequeue/OrderOperatePriceService.java | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 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 f37ed36..adf8b4c 100644 --- a/src/main/java/com/xcong/excoin/rabbit/pricequeue/OrderOperatePriceService.java +++ b/src/main/java/com/xcong/excoin/rabbit/pricequeue/OrderOperatePriceService.java @@ -51,25 +51,25 @@ Long orderId = order.getOrderId(); queue.add(new DescBigDecimal(price)); - log.info("原有:{}", JSONObject.toJSONString(orderMap)); +// log.info("原有:{}", JSONObject.toJSONString(orderMap)); removeExistOrder(type, orderId, orderMap); - log.info("删除后:{}", JSONObject.toJSONString(orderMap)); +// log.info("删除后:{}", JSONObject.toJSONString(orderMap)); if (orderMap.containsKey(price)) { // 有这个价的key List<OrderModel> list = orderMap.get(price); // 判断这个单的这个类型是否有 // if (CollectionUtils.isNotEmpty(list)) { // 新增 - OrderModel orderModel = new OrderModel(orderId, type, price, null,order.getOperateNo()); + OrderModel orderModel = new OrderModel(orderId, type, price, null,order.getOperateNo(), order.getMemberId()); list.add(orderModel); // } } else { List<OrderModel> list = new ArrayList<OrderModel>(); - OrderModel orderModel = new OrderModel(orderId, type, price, null,order.getOperateNo()); + OrderModel orderModel = new OrderModel(orderId, type, price, null,order.getOperateNo(), order.getMemberId()); list.add(orderModel); orderMap.put(price, list); } - log.info("调整后:{}", JSONObject.toJSONString(orderMap)); +// log.info("调整后:{}", JSONObject.toJSONString(orderMap)); } @@ -85,26 +85,26 @@ int type = order.getType(); Long orderId = order.getOrderId(); queue.add(new AscBigDecimal(price)); - log.info("原有:{}", JSONObject.toJSONString(orderMap)); +// log.info("原有:{}", JSONObject.toJSONString(orderMap)); // 需要找到这个订单的原始的单进行处理 removeExistOrder(type, orderId, orderMap); - log.info("删除后:{}", JSONObject.toJSONString(orderMap)); +// log.info("删除后:{}", JSONObject.toJSONString(orderMap)); if (orderMap.containsKey(price)) { // 有这个价的key List<OrderModel> list = orderMap.get(price); // 判断这个单的这个类型是否有 // if (CollectionUtils.isNotEmpty(list)) { // 新增 - OrderModel orderModel = new OrderModel(orderId, type, price, null,order.getOperateNo()); + OrderModel orderModel = new OrderModel(orderId, type, price, null,order.getOperateNo(), order.getMemberId()); list.add(orderModel); // } } else { List<OrderModel> list = new ArrayList<OrderModel>(); - OrderModel orderModel = new OrderModel(orderId, type, price, null,order.getOperateNo()); + OrderModel orderModel = new OrderModel(orderId, type, price, null,order.getOperateNo(), order.getMemberId()); list.add(orderModel); orderMap.put(price, list); } - log.info("调整后:{}", JSONObject.toJSONString(orderMap)); +// log.info("调整后:{}", JSONObject.toJSONString(orderMap)); } private static void removeExistOrder(Integer type, Long orderId, Map<String, List<OrderModel>> orderMap) { -- Gitblit v1.9.1