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

puzhibing

2026-04-16 46342ddcf5d52ccbf2ae8d8a9a0b14cc0d29b250

 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,7 @@
     * @param status
     * @return
     */
    @PostMapping("/inner/v1/testOrder/updateOrderStatus")
    @PostMapping("/logan/inner/v1/testOrder/updateOrderStatus")
    R<String> updateOrderStatus(@RequestParam Long orderId,
                                @RequestParam Integer status);

@@ -52,4 +54,13 @@
     */
    @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);
}