修改bug

liujie

2026-03-01 cbfd5627ea483ff99667f2fe1b1fcf1eaf389fb3

修改bug

 xp-robotaxi-itinerary-boot/src/main/java/com/xiaopeng/itinerary/controller/XpPricingController.java

@@ -90,9 +90,9 @@
    @XpClientCheck(checkToken = false, checkOtpToken = true)
    public R<SaveOrderVo> saveOrder(@RequestBody @Validated XpOrderDto dto, HttpServletRequest request) {
        String uid = request.getHeader("XP-Uid");
        Long l = xpPricingService.saveOrder(dto, uid);
        String orderId = xpPricingService.saveOrder(dto, uid);
        SaveOrderVo saveOrderVo = new SaveOrderVo();
        saveOrderVo.setOrderId(l);
        saveOrderVo.setOrderId(orderId);
        return R.ok(saveOrderVo);
    }


 xp-robotaxi-itinerary-boot/src/main/java/com/xiaopeng/itinerary/service/XpPricingService.java

@@ -43,7 +43,7 @@
     * @param uid
     * @return
     */
    Long saveOrder(XpOrderDto dto, String uid);
    String saveOrder(XpOrderDto dto, String uid);

    void testOrder(Long orderId, Integer status);


 xp-robotaxi-itinerary-boot/src/main/java/com/xiaopeng/itinerary/service/impl/XpPricingServiceImpl.java

@@ -415,7 +415,7 @@


    @Override
    public Long saveOrder(XpOrderDto dto, String uid) {
    public String saveOrder(XpOrderDto dto, String uid) {


        // 是否在运营区域时间内
@@ -561,7 +561,7 @@
        if (isSilent) {
            // todo 用于测试流程，正式联调需要删除此代码
//            testOrder(orderId);
            return orderId;
            return orderId.toString();
        }

        // 最大距离
@@ -601,7 +601,7 @@
                xpGeoQueryEntity.setTimestamp(System.currentTimeMillis());
                geoQueryEntityService.save(xpGeoQueryEntity);

                return orderId;
                return orderId.toString();
            }
        }

@@ -620,7 +620,7 @@
        xpGeoQueryEntity.setStatus(0);

        geoQueryEntityService.save(xpGeoQueryEntity);
        return orderId;
        return orderId.toString();

//
//        XpElectronicFenceArea xpElectronicFenceArea = xpElectronicFenceAreaMapper.selectById(dto.getXpElectronicFenceAreaId());

 xp-robotaxi-itinerary-boot/src/main/java/com/xiaopeng/itinerary/vo/SaveOrderVo.java

@@ -8,5 +8,5 @@
@ApiModel(value = "保存订单返回")
public class SaveOrderVo {
    @ApiModelProperty(value = "订单id 0静默不推单")
    private Long orderId;
    private String orderId;
}

 xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java

@@ -2010,7 +2010,7 @@
                // 存mongo数据
                xpPricingClient.updateXpGeoQueryEntity(split[0]);
                order.setAppUserId(null);
                this.updateById(order);


                // 修改车辆信息
                vehicle.setState(1);
@@ -2018,6 +2018,8 @@

                //绑定用户和车辆关系
                addTaxiPassengerVo.setUid(order.getAppUserId().toString());

                this.updateById(order);
                addTaxiPassengerVo.setOrderNo(order.getOrderNumber());
                // TODO appid
                addTaxiPassengerVo.setAppId("");