合并代码

puzhibing

2026-05-11 f8c54ebade0d00d7d98e8e694bd99531fae1b8ac

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

@@ -1672,10 +1672,19 @@
                    }
            );
        }
        data = data.stream().sorted(Comparator.comparingInt(XpHistoryStartPointsVo::getNum).reversed()).collect(Collectors.toList());

        return data;

        List<XpHistoryStartPointsVo> objects = new ArrayList<XpHistoryStartPointsVo>();
        if(!data.isEmpty()){
            //收藏的数据
            List<XpHistoryStartPointsVo> collect = data.stream().filter(s -> s.getIsCollect() == 1).collect(Collectors.toList());
            collect.sort(Comparator.comparingInt(XpHistoryStartPointsVo::getNum).reversed());
            objects.addAll(collect);
            //非收藏的数据
            List<XpHistoryStartPointsVo> collect1 = data.stream().filter(s -> s.getIsCollect() == 2).collect(Collectors.toList());
            collect1.sort(Comparator.comparingInt(XpHistoryStartPointsVo::getNum).reversed());
            objects.addAll(collect1);
        }
        return objects;
    }

    @Override
@@ -1703,9 +1712,18 @@
                    }
            );
        }
        data = data.stream().sorted(Comparator.comparingInt(XpHistoryEndPointsVo::getNum).reversed()).collect(Collectors.toList());

        return data;
        List<XpHistoryEndPointsVo> objects = new ArrayList<XpHistoryEndPointsVo>();
        if(!data.isEmpty()){
            //收藏的数据
            List<XpHistoryEndPointsVo> collect = data.stream().filter(s -> s.getIsCollect() == 1).collect(Collectors.toList());
            collect.sort(Comparator.comparingInt(XpHistoryEndPointsVo::getNum).reversed());
            objects.addAll(collect);
            //非收藏的数据
            List<XpHistoryEndPointsVo> collect1 = data.stream().filter(s -> s.getIsCollect() == 2).collect(Collectors.toList());
            collect1.sort(Comparator.comparingInt(XpHistoryEndPointsVo::getNum).reversed());
            objects.addAll(collect1);
        }
        return objects;

    }