Merge remote-tracking branch 'origin/master'

xuhy

2026-03-26 bbd837a72bb9ec1bcef044624960345f98969a49

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

@@ -6,6 +6,7 @@
import com.xiaopeng.api.dto.statistics.StatisticsQueryDTO;
import com.xiaopeng.api.factory.order.XpOrderClientFallbackFactory;
import com.xiaopeng.api.model.order.XpOrder;
import com.xiaopeng.api.vo.order.OrderTrajectoryVo;
import com.xiaopeng.common.core.domain.R;
import com.xiaopeng.common.core.dto.ServiceNameConstantsEnum;
import org.springframework.cloud.openfeign.FeignClient;
@@ -35,7 +36,7 @@
     * 查询是否有未支付订单 或 正在进行的订单
     */
    @PostMapping("/inner/order/has-unpaid-order")
    R<Long> hasUnPaodOrder(String uid);
    R<Long> hasUnPaodOrder(@RequestParam String uid);


    /**
@@ -85,6 +86,26 @@
    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("/inner/order/countActiveOrders")
    R<Integer> countActiveOrdersByCityId(@RequestParam("cityId") Long cityId);


    /**
     * 成功操作下发命令后调用 用于弹出redis队列的获取成功的数据
     */
@@ -99,4 +120,26 @@
    @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);


    /**
     * 保存订单轨迹数据
     * @param orderTrajectory
     * @return
     */
    @PostMapping("/inner/v1/order/saveVehicleLocation")
    R<String> saveVehicleLocation(@RequestBody OrderTrajectoryVo orderTrajectory);



}