修改点位排序

yyy

2026-05-11 b8def0e108af17b7ffe3bcfc65f5ffc7f999efb0

 xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java

@@ -1677,11 +1677,11 @@
        if(!data.isEmpty()){
            //收藏的数据
            List<XpHistoryStartPointsVo> collect = data.stream().filter(s -> s.getIsCollect() == 1).collect(Collectors.toList());
            collect.sort(Comparator.comparingInt(XpHistoryStartPointsVo::getNum).reversed());
            collect.sort((o1, o2)->o1.getDistance().compareTo(o2.getDistance()) * -1);
            objects.addAll(collect);
            //非收藏的数据
            List<XpHistoryStartPointsVo> collect1 = data.stream().filter(s -> s.getIsCollect() == 2).collect(Collectors.toList());
            collect1.sort(Comparator.comparingInt(XpHistoryStartPointsVo::getNum).reversed());
            collect1.sort((o1, o2)->o1.getDistance().compareTo(o2.getDistance()) * -1);
            objects.addAll(collect1);
        }
        return objects;
@@ -1716,11 +1716,11 @@
        if(!data.isEmpty()){
            //收藏的数据
            List<XpHistoryEndPointsVo> collect = data.stream().filter(s -> s.getIsCollect() == 1).collect(Collectors.toList());
            collect.sort(Comparator.comparingInt(XpHistoryEndPointsVo::getNum).reversed());
            collect.sort((o1, o2)->o1.getDistance().compareTo(o2.getDistance()) * -1);
            objects.addAll(collect);
            //非收藏的数据
            List<XpHistoryEndPointsVo> collect1 = data.stream().filter(s -> s.getIsCollect() == 2).collect(Collectors.toList());
            collect1.sort(Comparator.comparingInt(XpHistoryEndPointsVo::getNum).reversed());
            collect1.sort((o1, o2)->o1.getDistance().compareTo(o2.getDistance()) * -1);
            objects.addAll(collect1);
        }
        return objects;