Merge remote-tracking branch 'origin/1.0' into 1.0

kong

2026-04-12 7f3081da3c0597cfbfc8f0fc4e342c4ceb901f6d

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

@@ -28,14 +28,14 @@
     * @param query 查询参数
     * @return 订单统计数据
     */
    @PostMapping("/inner/order/statistics")
    @PostMapping("/logan/inner/order/statistics")
    R<OrderStatisticsDTO> getOrderStatistics(@RequestBody StatisticsQueryDTO query);


    /**
     * 查询是否有未支付订单 或 正在进行的订单
     */
    @PostMapping("/inner/order/has-unpaid-order")
    @PostMapping("/logan/inner/order/has-unpaid-order")
    R<Long> hasUnPaodOrder(@RequestParam String uid);


@@ -45,7 +45,7 @@
     * @param orderId 订单id
     * @return 订单详情
     */
    @PostMapping("/inner/order/queryOrderById")
    @PostMapping("/logan/inner/order/queryOrderById")
    R<XpOrder> queryOrderById(@RequestParam Long orderId);

    /**
@@ -53,7 +53,7 @@
     *
     * @param xpOrder 订单信息
     */
    @PostMapping("/inner/order/addOrder")
    @PostMapping("/logan/inner/order/addOrder")
    R<Long> addOrder(@RequestBody XpOrder xpOrder);


@@ -62,7 +62,7 @@
     *
     * @param orderId 订单id
     */
    @PostMapping("/inner/order/cancelOrder")
    @PostMapping("/logan/inner/order/cancelOrder")
    R<?> cancelOrder(@RequestParam("orderId") String orderId);


@@ -72,7 +72,7 @@
     * @param orderNo 订单编号
     * @return 订单详情
     */
    @PostMapping("/inner/order/queryOrderByOrderNo")
    @PostMapping("/logan/inner/order/queryOrderByOrderNo")
    R<XpOrder> queryOrderByOrderNo(@RequestParam String orderNo);


@@ -82,14 +82,34 @@
     * @param
     * @return 订单数量
     */
    @PostMapping("/inner/order/getOrderNum")
    @PostMapping("/logan/inner/order/getOrderNum")
    R<Integer> getOrderNum(@RequestBody GetOrderNumDto dto);



    /**
     * 当日取消订单次数
     *
     * @param
     * @return 订单数量
     */
    @PostMapping("/inner/order/todayCancellationCount")
    R<Integer> todayCancellationCount(@RequestParam Long userId);

    /**
     * 查询指定城市进行中的订单数量（status=1）
     *
     * @param cityId 开通城市ID
     * @return 进行中订单数量
     */
    @GetMapping("/logan/inner/order/countActiveOrders")
    R<Integer> countActiveOrdersByCityId(@RequestParam("cityId") Long cityId);


    /**
     * 成功操作下发命令后调用 用于弹出redis队列的获取成功的数据
     */
    @PostMapping("/inner/order/popOrder")
    @PostMapping("/logan/inner/order/popOrder")
    R<?> popOrder(@RequestBody PopOrderDto dto);

    /**
@@ -97,7 +117,7 @@
     *
     * @param xpOrder 订单信息
     */
    @PostMapping("/inner/order/updateOrder")
    @PostMapping("/logan/inner/order/updateOrder")
    R<?> updateOrder(@RequestBody XpOrder xpOrder);


@@ -107,7 +127,7 @@
     * @param status
     * @return
     */
    @PostMapping("/inner/v1/order/updateOrderStatus")
    @PostMapping("/logan/inner/v1/order/updateOrderStatus")
    R<String> updateOrderStatus(@RequestParam Long orderId,
                                       @RequestParam Integer status);

@@ -117,7 +137,7 @@
     * @param orderTrajectory
     * @return
     */
    @PostMapping("/inner/v1/order/saveVehicleLocation")
    @PostMapping("/logan/inner/v1/order/saveVehicleLocation")
    R<String> saveVehicleLocation(@RequestBody OrderTrajectoryVo orderTrajectory);