Merge branch 'master' into whole

Helius

2020-08-24 1afe0ef75b6741a322cd8057870585a3c03d4da3

 src/main/java/com/xcong/excoin/rabbit/pricequeue/OrderOperatePriceService.java

@@ -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());