Merge remote-tracking branch 'origin/master'

xuhy

2026-02-26 1cf78d7b0e01a2d960ade3033658c0ab7fac8cd3

 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);

}