From bbd837a72bb9ec1bcef044624960345f98969a49 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 26 三月 2026 16:53:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/IXpTestOrderService.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/IXpTestOrderService.java b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/IXpTestOrderService.java
index c29a648..ba1c50e 100644
--- a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/IXpTestOrderService.java
+++ b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/IXpTestOrderService.java
@@ -24,6 +24,7 @@
 import com.xiaopeng.order.model.vo.*;
 import com.xiaopeng.order.vo.OrderDetailVo;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -121,4 +122,12 @@
      * @param amount
      */
     void changeAmount(Long id, BigDecimal amount);
+
+
+    /**
+     * 取消订单
+     * @param orderId
+     * @return
+     */
+    R<?> cancelTestOrderById(Long orderId);
 }

--
Gitblit v1.7.1