Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi

liujie

2026-02-13 521162dbd38c7b1e6ab88aa5f2e6546da635c8c5

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi

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

@@ -1626,6 +1626,17 @@
                OrderTrajectory.class
        );
        orderDetailVo.setTrajectories(trajectories);
        if (order.getTripBegin()!=null&&order.getTripEnd()!=null){
            // 计算两个时间相差多少分钟
            long minutesDifference = Duration.between(order.getTripBegin(), order.getTripEnd()).toMinutes();
            orderDetailVo.setOrderTime(minutesDifference);
        }else{
            orderDetailVo.setOrderTime(0l);
        }
        if (order.getStartMileage()!=null){
            orderDetailVo.setTotalMileage(order.getStartMileage()+(order.getMileageKilometers()!=null?order.getMileageKilometers():0D));

        }
        return orderDetailVo;
    }


 xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/vo/OrderDetailVo.java

@@ -28,7 +28,10 @@
    private String feedbackTypeName;
    @ApiModelProperty(value = "评分")
    private Integer orderRating;

    @ApiModelProperty(value = "时长分钟")
    private Long orderTime;
    @ApiModelProperty(value = "总里程")
    private Double totalMileage;
    @ApiModelProperty(value = "轨迹")
    private List<OrderTrajectory> trajectories;
}