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

liujie

2026-02-24 0052bdb801a73b91770f6352f1a12ec5b101a8f1

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

 xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/operation/XpPointClient.java

@@ -56,8 +56,8 @@
    /**
     * 点位删除
     */
    @GetMapping("/api/v1/point/deletePoint/{ids}")
    R deletePoint(@PathVariable("ids") String ids);
    @GetMapping("/api/v1/point/deletePoint")
    R deletePoint( String ids);

    /**
     * 启用/禁用

 xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpPointManagementController.java

@@ -74,10 +74,10 @@
    /**
     * 批量删除点位
     */
    @GetMapping("/deletePoint/{ids}")
    @GetMapping("/deletePoint")
    @ResponseBody
    @ApiOperation(value = "删除点位")
    public R deletePoint(@PathVariable("ids") String ids) {
    public R deletePoint( String ids) {
        xpPointClient.deletePoint(ids);
        return R.ok();
    }

 xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpPointManagementController.java

@@ -73,10 +73,10 @@
    /**
     * 批量删除点位
     */
    @GetMapping("/deletePoint/{ids}")
    @GetMapping("/deletePoint")
    @ResponseBody
    @ApiOperation(value = "删除点位")
    public R deletePoint(@PathVariable("ids") String ids) {
    public R deletePoint(String ids) {
        xpPointService.removeBatchByIds(Arrays.stream(ids.split(",")).map(Long::parseLong).collect(Collectors.toList()));
        return R.ok();
    }

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

@@ -1440,6 +1440,11 @@
        res.setKilometer(BigDecimal.valueOf(order.getMileageKilometers()));
        LocalDateTime createTime = order.getCreateTime();
        LocalDateTime tripEnd = order.getTripEnd();
        if (tripEnd==null){
            tripEnd = LocalDateTime.now();
            order.setTripEnd(tripEnd);
            this.updateById(order);
        }
        // 计算行程时间 单位分钟
        // 计算时间差
        Duration durationBetween = Duration.between(createTime, tripEnd);