1

zj

2024-08-06 658e843113e09d1bf319a29e40a17a2d11ffabab

 websocketSerivce/src/main/java/org/example/websocket/server/WsServer.java

@@ -214,11 +214,9 @@
                    .collect(Collectors.toList());
        }
        //价差
        if(wsBo.getSpread() > 0){
            redisValueMap = redisValueMap.stream()
                    .filter(data -> Double.parseDouble(data.getSpread()) >= wsBo.getSpread())
                    .collect(Collectors.toList());
        }
        //最低金额
        if(null !=  wsBo.getMinAmount()){
            redisValueMap = redisValueMap.stream()
@@ -271,9 +269,39 @@
        Collections.sort(marketDataList, new Comparator<MarketDataOut>() {
            @Override
            public int compare(MarketDataOut a, MarketDataOut b) {
                // 将买入总价和卖出总价转换为 BigDecimal
                BigDecimal buyTotalPriceA = new BigDecimal(a.getBuyTotalPrice());
                BigDecimal buyTotalPriceB = new BigDecimal(b.getBuyTotalPrice());
                BigDecimal sellTotalPriceA = new BigDecimal(a.getSellTotalPrice());
                BigDecimal sellTotalPriceB = new BigDecimal(b.getSellTotalPrice());
                BigDecimal spreadA = new BigDecimal(a.getSpread());
                BigDecimal spreadB = new BigDecimal(b.getSpread());
                return spreadB.compareTo(spreadA);

                // 检查 a 和 b 的买入总价或卖出总价是否大于 1000
                boolean aBuyOrSellAbove1000 = buyTotalPriceA.compareTo(new BigDecimal("1000")) > 0 || sellTotalPriceA.compareTo(new BigDecimal("1000")) > 0;
                boolean bBuyOrSellAbove1000 = buyTotalPriceB.compareTo(new BigDecimal("1000")) > 0 || sellTotalPriceB.compareTo(new BigDecimal("1000")) > 0;

                if (aBuyOrSellAbove1000 && !bBuyOrSellAbove1000) {
                    return -1; // a 应排在 b 前面
                } else if (!aBuyOrSellAbove1000 && bBuyOrSellAbove1000) {
                    return 1; // b 应排在 a 前面
                } else {
                    // a 和 b 都大于 1000 或都小于等于 1000
                    // 先按照 spread 的降序排列
                    int spreadComparison = spreadB.compareTo(spreadA);
                    if (spreadComparison != 0) {
                        return spreadComparison; // 先按照 spread 排序
                    } else {
                        // 如果 spread 相同，再按照买入总价或卖出总价的升序排列
                        if (aBuyOrSellAbove1000) {
                            // 对于买入总价或卖出总价大于 1000 的记录
                            return buyTotalPriceA.compareTo(buyTotalPriceB); // 按照买入总价升序排序
                        } else {
                            // 对于买入总价或卖出总价小于等于 1000 的记录
                            return buyTotalPriceA.compareTo(buyTotalPriceB); // 可以选择卖出总价或买入总价的升序排序
                        }
                    }
                }
            }
        });
    }