xp-robotaxi-itinerary-boot/src/main/java/com/xiaopeng/itinerary/service/impl/XpPricingServiceImpl.java
@@ -362,11 +362,11 @@ } // 10. 检查等待时间 Integer waitTime = getWaitTime(routeAndFareDto.getOrigin().getLongitude(), routeAndFareDto.getOrigin().getLatitude()); if (waitTime > 3) { throw new ServiceException("当前区域正在等待中,请耐心等待", I18nKeyConstant.WAITING_TIME); } fareVo.setWaitingTime(waitTime); // Integer waitTime = getWaitTime(routeAndFareDto.getOrigin().getLongitude(), routeAndFareDto.getOrigin().getLatitude()); // if (waitTime > 3) { // throw new ServiceException("当前区域正在等待中,请耐心等待", I18nKeyConstant.WAITING_TIME); // } // fareVo.setWaitingTime(waitTime); // 11. 生成订单ID并缓存 @@ -468,16 +468,16 @@ } // 判断当天取消的次数 后台配置 redis 查询 Object cancelOrder = redisService.getCacheObject("CANCEL_ORDER_" + uid); log.info("取消次数：{}", cancelOrder); // 静默处理 boolean isSilent = false; if (cancelOrder != null) { Integer num = Integer.valueOf(cancelOrder.toString()); if (num >= cancelCount) { isSilent = true; } } // Object cancelOrder = redisService.getCacheObject("CANCEL_ORDER_" + uid); // log.info("取消次数：{}", cancelOrder); // // 静默处理 // boolean isSilent = false; // if (cancelOrder != null) { // Integer num = Integer.valueOf(cancelOrder.toString()); // if (num >= cancelCount) { // isSilent = true; // } // } // 获取起步里程 @@ -574,10 +574,10 @@ Long orderId = addOrderR.getData(); xpOrder.setId(orderId); // 静默处理 不推单 if (isSilent) { log.info("订单取消次数达到上限，执行静默处理，不推单。"); return orderId.toString(); } // if (isSilent) { // log.info("订单取消次数达到上限，执行静默处理，不推单。"); // return orderId.toString(); // } // 最大距离 Object maxPushDistanceObj = redisService.getCacheObject(CacheConstants.MAX_PUSH_DISTANCE); xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPricingServiceImpl.java
@@ -341,11 +341,11 @@ } // 10. 检查等待时间 Integer waitTime = getWaitTime(routeAndFareDto.getOrigin().getLongitude(), routeAndFareDto.getOrigin().getLatitude()); if (waitTime > 3) { throw new ServiceException("当前区域正在等待中,请耐心等待", I18nKeyConstant.WAITING_TIME); } fareVo.setWaitingTime(waitTime); // Integer waitTime = getWaitTime(routeAndFareDto.getOrigin().getLongitude(), routeAndFareDto.getOrigin().getLatitude()); // if (waitTime > 3) { // throw new ServiceException("当前区域正在等待中,请耐心等待", I18nKeyConstant.WAITING_TIME); // } // fareVo.setWaitingTime(waitTime); // 11. 生成订单ID并缓存 xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java
@@ -259,7 +259,7 @@ // 更改 暂不限制数量 List<VehiclePosition> positionList = vehiclePositionService.findAvailableVehiclesNearby(Double.parseDouble(split[0]), Double.parseDouble(split[1]), xpTradingStrategy.getOnePushDistance(), xpTradingStrategy.getSimultaneouslyOrderCount()); log.info("根据距离找车 {}", positionList); // 获取车辆的区域信息 if (positionList.isEmpty()) { continue; @@ -268,10 +268,10 @@ // 获取车辆的信息 筛选出可用车辆 R<List<String>> vehiclePositionVos = xpVehicleClient.queryVehiclePositionByVin(new VehiclePositionByVinDto(xpElectronicFence.getId(), vinList, xpTradingStrategy.getSimultaneouslyOrderCount())); log.info("筛选可用车辆结果 {}", vehiclePositionVos); if (vehiclePositionVos.getCode() != 200) { continue; } List<VehiclePositionVo> availableVehiclesNearby = BeanUtil.copyToList(positionList, VehiclePositionVo.class); List<String> data = vehiclePositionVos.getData(); @@ -282,6 +282,7 @@ if (!availableVehiclesNearby.isEmpty()) { if (availableVehiclesNearby.size() > 1) { log.info("附近有 {} 辆车，进入权重按断流程", availableVehiclesNearby.size()); // 走权重 // 订单价值 @@ -772,8 +773,9 @@ continue; } XpVehicle vehiclePosition = vehiclePositionR.getData(); log.info("符合条件的车辆 {} ，直接推单XPU", vehiclePosition.getPlateNumber()); log.info("当前车辆状态 {}", vehiclePosition.getStatus()); if (vehiclePosition.getStatus() != 1 || vehiclePosition.getState() != 0 || vehiclePosition.getVehicleType()==1) { lock.unlock(); continue; } // 关闭巡游单子 @@ -790,9 +792,11 @@ pushOrderDto.setOrderType(OrderType.USER_ORDER); pushOrderDto.setStage(1); // 调用推送服务 orderId + carVin orderMissionClient.pushOrder(pushOrderDto); // orderMissionClient.pushOrder(pushOrderDto); log.info("开始推送 {} 订单到XPU", xpOrder.getOrderNumber()); redisService.popFirstElement(quoteName); log.info("将订单 {} 从队列 {} 弹出去", xpOrder.getOrderNumber(), quoteName); return; } catch (Exception e) { e.printStackTrace(); @@ -814,6 +818,8 @@ continue; } XpVehicle vehicleId1 = vehicleR.getData(); log.info("附近只有一个车辆 {} ，直接推单XPU", vehicleId1.getPlateNumber()); log.info("当前车辆状态 {}", vehicleId1.getStatus()); if (vehicleId1.getStatus() != 1 || vehicleId1.getState() != 0 || vehicleId1.getVehicleType()==1) { lock.unlock(); continue; @@ -831,8 +837,10 @@ pushOrderDto.setOrderType(OrderType.USER_ORDER); pushOrderDto.setStage(1); // 调用推送服务 orderId + carVin orderMissionClient.pushOrder(pushOrderDto); // orderMissionClient.pushOrder(pushOrderDto); log.info("开始推送 {} 订单到XPU", xpOrder.getOrderNumber()); redisService.popFirstElement(quoteName); log.info("将订单 {} 从队列 {} 弹出去", xpOrder.getOrderNumber(), quoteName); return; } catch (Exception e) {
