Merge remote-tracking branch 'origin/master'

“mitao”

2026-02-13 bfb020da5cf8aa89c5eaae9e59e9ea8e04a49448

 xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/order/XpOrderClient.java

@@ -1,6 +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;
@@ -61,7 +62,7 @@
     * @param orderId 订单id
     */
    @PostMapping("/inner/order/cancelOrder")
    R<?> cancelOrder(String orderId);
    R<?> cancelOrder(@RequestParam("orderId") String orderId);


    /**
@@ -84,4 +85,18 @@
    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);

}