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

“mitao”

2026-05-15 5c863676b014e5ae2fa601d89a83160b6e7a6c07

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

@@ -2,10 +2,12 @@

import com.xiaopeng.api.factory.order.XpTestOrderClientFallbackFactory;
import com.xiaopeng.api.model.order.XpTestOrder;
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;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;


@@ -20,7 +22,7 @@
     * @param orderId 订单id
     * @return 订单详情
     */
    @PostMapping("/inner/v1/testOrder/queryOrderById")
    @PostMapping("/logan/inner/v1/testOrder/queryOrderById")
    R<XpTestOrder> queryOrderById(@RequestParam Long orderId);


@@ -30,7 +32,35 @@
     * @param status
     * @return
     */
    @PostMapping("/inner/v1/testOrder/updateOrderStatus")
    @PostMapping("/logan/inner/v1/testOrder/updateOrderStatus")
    R<String> updateOrderStatus(@RequestParam Long orderId,
                                @RequestParam Integer status);


    /**
     * 根据订单ID查询取消订单
     *
     * @param orderId
     * @return
     */
    @PostMapping("/inner/testOrder/cancelTestOrderById")
    R<?> cancelTestOrderById(@RequestParam Long orderId);


    /**
     * 根据测试计划ID查询订单数量
     * @param testPlanId
     * @return
     */
    @PostMapping("/inner/v1/testOrder/queryCountByTestPlanId")
    R<Long> queryCountByTestPlanId(@RequestParam Long testPlanId);


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