From bfb020da5cf8aa89c5eaae9e59e9ea8e04a49448 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期五, 13 二月 2026 17:15:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/order/XpOrderClient.java |   29 ++++++++++++++++++++++++++++-
 1 files changed, 28 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 95ea609..4c46788 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
@@ -1,5 +1,7 @@
 package com.xiaopeng.api.feignClient.order;
 
+import com.xiaopeng.api.dto.order.GetOrderNumDto;
+import com.xiaopeng.api.dto.order.PopOrderDto;
 import com.xiaopeng.api.dto.statistics.OrderStatisticsDTO;
 import com.xiaopeng.api.dto.statistics.StatisticsQueryDTO;
 import com.xiaopeng.api.factory.order.XpOrderClientFallbackFactory;
@@ -60,7 +62,7 @@
      * @param orderId 订单id
      */
     @PostMapping("/inner/order/cancelOrder")
-    R<?> cancelOrder(String orderId);
+    R<?> cancelOrder(@RequestParam("orderId") String orderId);
 
 
     /**
@@ -72,4 +74,29 @@
     @PostMapping("/inner/order/queryOrderByOrderNo")
     R<XpOrder> queryOrderByOrderNo(@RequestParam String orderNo);
 
+
+    /**
+     * 获取订单数量
+     *
+     * @param
+     * @return 订单数量
+     */
+    @PostMapping("/inner/order/getOrderNum")
+    R<Integer> getOrderNum(@RequestBody GetOrderNumDto dto);
+
+
+    /**
+     * 成功操作下发命令后调用 用于弹出redis队列的获取成功的数据
+     */
+    @PostMapping("/inner/order/popOrder")
+    R<?> popOrder(@RequestBody PopOrderDto dto);
+
+    /**
+     * 修改订单信息
+     *
+     * @param xpOrder 订单信息
+     */
+    @PostMapping("/inner/order/updateOrder")
+    R<?> updateOrder(@RequestBody XpOrder xpOrder);
+
 }

--
Gitblit v1.7.1