Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi in...

puzhibing

2026-05-13 066b4c8f4ba22ad90d87c957f357fdb73409dbc3

Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.0

 xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/order/OrderStatusFromOrderIdVo.java

New file
@@ -0,0 +1,12 @@
package com.xiaopeng.api.vo.order;

import io.swagger.annotations.ApiModel;
import lombok.Data;

@Data
@ApiModel("订单支付状态VO")
public class OrderStatusFromOrderIdVo {
    private Long orderId;

    private Integer status;
}

 xp-robotaxi-common/xp-common-core/src/main/java/com/xiaopeng/common/core/utils/SensitiveDataCryptoUtil.java

@@ -12,7 +12,7 @@
 */
public final class SensitiveDataCryptoUtil {

    private static final String KEY = "cm9ib3RheGktc2Vuc2l0aXZlLWRhdGEtMjAyNg==";
    private static final String KEY = AESUtil.generateKeyFromPassword("robotaxi-sensitive-data-2026", AESUtil.KEY_LENGTH_128);

    private SensitiveDataCryptoUtil() {
    }

 xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpOrderController.java

@@ -950,4 +950,19 @@
        XpOrderInfoVo xpOrderInfoVo = BeanUtil.copyProperties(xpOrder, XpOrderInfoVo.class);
        return R.ok(xpOrderInfoVo);
    }



    @ApiOperation(value = "获取订单支付状态", tags = {"小程序-业务流程"})
    @GetMapping("/api/v1/mini-program/order/queryOrderStatusFromOrderId")
    @XpClientCheck(checkToken = false, checkOtpToken = true)
    public R<OrderStatusFromOrderIdVo> queryOrderStatusFromOrderId(Long orderId) {
        XpOrder order = xpOrderService.getById(orderId);
        OrderStatusFromOrderIdVo orderStatusFromOrderIdVo = new OrderStatusFromOrderIdVo();
        orderStatusFromOrderIdVo.setOrderId(order.getId());
        orderStatusFromOrderIdVo.setStatus(order.getStatus());
        return R.ok(orderStatusFromOrderIdVo);

    }

}