From 1cf78d7b0e01a2d960ade3033658c0ab7fac8cd3 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 26 二月 2026 11:45:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/order/XpOrderClient.java |   21 ++++++++++++++++++++-
 1 files changed, 20 insertions(+), 1 deletions(-)

diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/order/XpOrderClient.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/order/XpOrderClient.java
index 2939e88..3fb57aa 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/order/XpOrderClient.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/order/XpOrderClient.java
@@ -35,7 +35,7 @@
      * 查询是否有未支付订单 或 正在进行的订单
      */
     @PostMapping("/inner/order/has-unpaid-order")
-    R<Long> hasUnPaodOrder(String uid);
+    R<Long> hasUnPaodOrder(@RequestParam String uid);
 
 
     /**
@@ -91,4 +91,23 @@
     @PostMapping("/inner/order/popOrder")
     R<?> popOrder(@RequestBody PopOrderDto dto);
 
+    /**
+     * 修改订单信息
+     *
+     * @param xpOrder 订单信息
+     */
+    @PostMapping("/inner/order/updateOrder")
+    R<?> updateOrder(@RequestBody XpOrder xpOrder);
+
+
+    /**
+     * 修改订单状态
+     * @param orderId
+     * @param status
+     * @return
+     */
+    @PostMapping("/inner/v1/order/updateOrderStatus")
+    R<String> updateOrderStatus(@RequestParam Long orderId,
+                                       @RequestParam Integer status);
+
 }

--
Gitblit v1.7.1