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

liujie

2026-03-25 d597b03477f904bc87bc9c3a984f9bfa485a906d

 xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/service/impl/XpVehicleServiceImpl.java

@@ -320,8 +320,8 @@
            String result = vehicleControlUtil.vehiclesCommand(vehiclesCommandVo, xpOrder.getAppUserId());
            log.info("车辆控制结果：{}", result);
            JSONObject jsonObject = JSONObject.parseObject(result);
            Integer code = jsonObject.getInteger("code");
            if (code != 0) {
            String msgId = jsonObject.getString("msgId");
            if (StringUtils.isEmpty(msgId)) {
                return 0;
            }else {
                xpOrderClient.updateOrder(xpOrder);
@@ -361,8 +361,8 @@
            String result = vehicleControlUtil.vehiclesCommand(vehiclesCommandVo, xpOrder.getAppUserId());
            log.info("车辆控制结果：{}", result);
            JSONObject jsonObject = JSONObject.parseObject(result);
            Integer code = jsonObject.getInteger("code");
            if (code != 0) {
            String msgId = jsonObject.getString("msgId");
            if (StringUtils.isEmpty(msgId)) {
                return 0;
            }else {
                return 1;