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/XpOrderClient.java

@@ -10,7 +10,12 @@
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.*;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;

import java.util.List;

/**
 * 订单Feign客户端
@@ -28,15 +33,21 @@
     * @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);

    /**
     * 查询是否有未支付订单
     */
    @PostMapping("/logan/inner/order/has-unpay-order")
    R<Long> hasUnPayOrder(@RequestParam String uid);


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

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


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


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


@@ -82,8 +93,19 @@
     * @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）
@@ -91,14 +113,14 @@
     * @param cityId 开通城市ID
     * @return 进行中订单数量
     */
    @GetMapping("/inner/order/countActiveOrders")
    @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);

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


@@ -116,9 +138,17 @@
     * @param status
     * @return
     */
    @PostMapping("/inner/v1/order/updateOrderStatus")
    @PostMapping("/logan/inner/v1/order/updateOrderStatus")
    R<String> updateOrderStatus(@RequestParam Long orderId,
                                       @RequestParam Integer status);
                                @RequestParam Integer status,
                                @RequestParam Boolean orderException);
    /**
     * 行驶中车辆异常，订单状态修改- 修改状态=7 再修改 金额-再将状态修改成8
     * @param orderId
     * @return
     */
    @PostMapping("/logan/inner/v1/order/carAbnormalUpdateOrderStatus")
    R<String> carAbnormalUpdateOrderStatus(@RequestParam Long orderId);


    /**
@@ -126,9 +156,34 @@
     * @param orderTrajectory
     * @return
     */
    @PostMapping("/inner/v1/order/saveVehicleLocation")
    @PostMapping("/logan/inner/v1/order/saveVehicleLocation")
    R<String> saveVehicleLocation(@RequestBody OrderTrajectoryVo orderTrajectory);



    /**
     * 判断用户类型
     * @param userId
     * @return 1=老用户，2=新用户，3=流失用户
     */
    @PostMapping("/logan/inner/order/determineUserType")
    R<Integer> determineUserType(@RequestParam Long userId);


    /**
     * 获取用户订单数量
     * @param userId
     * @return
     */
    @PostMapping("/logan/inner/order/getUserOrderNum")
    R<Long> getUserOrderNum(@RequestParam Long userId);


    /**
     * 判断用户类型
     * @param userType
     * @return 2=老用户，3=新用户，4=流失用户
     */
    @PostMapping("/logan/inner/order/getUserTypeIdList")
    R<List<Long>> getUserTypeIdList(@RequestParam Integer userType);
}