From 015a3183afd9191f6ca16984eefb0edf5119091f Mon Sep 17 00:00:00 2001
From: yyy <1083599556@qq.com>
Date: 星期一, 20 四月 2026 13:58:48 +0800
Subject: [PATCH] 1.订单管理改派修改 2.订单管理关闭订单修改

---
 xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpOrderController.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpOrderController.java b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpOrderController.java
index f8586b9..fc9fb2a 100644
--- a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpOrderController.java
+++ b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpOrderController.java
@@ -291,7 +291,7 @@
     @ApiOperation(value = "取消/关闭订单", tags = {"管理后台-交易管理-订单管理"})
     @PostMapping("/api/v1/order/cancelAndCloseById")
     public R<?> cancelAndCloseById(@Validated @RequestBody XpOrderOperateDTO dto) {
-        xpOrderService.cancelOrCloseOrder(dto.getOrderId(), dto.getType());
+        xpOrderService.cancelOrCloseOrder(dto.getOrderId(), dto.getType(),dto.getIsFree());
         return R.ok();
     }
 
@@ -301,7 +301,7 @@
      * @param dto 改派请求参数
      * @return 操作结果
      */
-    @ApiOperation(value = "改派订单", tags = {"管理后台-交易管理-订单管理"}, notes = "车辆列表在vehicleConvoy服务")
+    @ApiOperation(value = "改派订单", tags = {"管理后台-交易管理-订单管理"}, notes = "车辆列表在 vehicleConvoy.availableList 服务")
     @PostMapping("/api/v1/order/reassignById")
     public R<?> reassignById(@Validated @RequestBody XpOrderReassignDTO dto) {
         xpOrderService.reassignOrder(

--
Gitblit v1.7.1