From f5e6133809c553cfd9fb28ee61019927c547c374 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Wed, 08 Dec 2021 15:58:33 +0800 Subject: [PATCH] 20211208 fish --- src/main/java/com/xcong/excoin/rabbit/pricequeue/OrderOperatePriceService.java | 18 +++++++++++++----- 1 files changed, 13 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 7685839..d936325 100644 --- a/src/main/java/com/xcong/excoin/rabbit/pricequeue/OrderOperatePriceService.java +++ b/src/main/java/com/xcong/excoin/rabbit/pricequeue/OrderOperatePriceService.java @@ -1,5 +1,7 @@ package com.xcong.excoin.rabbit.pricequeue; +import com.alibaba.fastjson.JSONObject; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import java.util.ArrayList; @@ -11,6 +13,7 @@ /** * 处理消费者的订单止盈等价格信息 */ +@Slf4j public class OrderOperatePriceService { /** @@ -48,22 +51,25 @@ Long orderId = order.getOrderId(); queue.add(new DescBigDecimal(price)); + log.info("原有:{}", JSONObject.toJSONString(orderMap)); removeExistOrder(type, orderId, orderMap); + log.info("删除后:{}", JSONObject.toJSONString(orderMap)); if (orderMap.containsKey(price)) { // 有这个价的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()); list.add(orderModel); orderMap.put(price, list); } + log.info("调整后:{}", JSONObject.toJSONString(orderMap)); } @@ -79,24 +85,26 @@ int type = order.getType(); Long orderId = order.getOrderId(); queue.add(new AscBigDecimal(price)); + log.info("原有:{}", JSONObject.toJSONString(orderMap)); // 需要找到这个订单的原始的单进行处理 removeExistOrder(type, orderId, orderMap); - + log.info("删除后:{}", JSONObject.toJSONString(orderMap)); if (orderMap.containsKey(price)) { // 有这个价的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()); list.add(orderModel); orderMap.put(price, list); } + log.info("调整后:{}", JSONObject.toJSONString(orderMap)); } private static void removeExistOrder(Integer type, Long orderId, Map<String, List<OrderModel>> orderMap) { -- Gitblit v1.9.1