java/Robotaxi.git

			@@ -69,9 +69,11 @@
			return R.fail();
			}


			@Override
			public R<Integer> getOrderNum(GetOrderNumDto dto) {
			return null;
			log.error("获取订单数量失败，原因: {}", cause.getMessage());
			return R.fail();
			}
			};
			}

			@@ -385,10 +385,12 @@

			// 判断当天取消的次数后台配置 redis 查询
			Object cancelOrder = redisService.getCacheObject("CANCEL_ORDER_" + uid);
			// 静默处理
			boolean isSilent = false;
			if (cancelOrder != null) {
			Integer num = Integer.valueOf(cancelOrder.toString());
			if (num >= cancelCount) {
			return 0l;
			isSilent =true;
			}
			}

			@@ -471,8 +473,7 @@
			Integer distance = 0;
			Integer duration = 0;
			if (distanceAndDuration.getCode() != 200) {
			//静默处理
			return 0l;
			throw new ServiceException("订单生成失败", I18nKeyConstant.ORDER_CREATE_FAIL);
			}
			distance = distanceAndDuration.getData().getDistance();
			duration = distanceAndDuration.getData().getDuration();
			@@ -484,6 +485,12 @@
			throw new ServiceException("订单生成失败", I18nKeyConstant.ORDER_CREATE_FAIL);
			}
			Long orderId = addOrderR.getData();

			// 静默处理不推单
			if(isSilent){
			return orderId;
			}

			// 最大距离
			Object maxPushDistanceObj = redisService.getCacheObject(CacheConstants.MAX_PUSH_DISTANCE);
			Double maxPushDistance = 0.0;

			@@ -797,10 +797,16 @@
			DateUtils.localDateTimeToDate(LocalDateTime.now().plusMinutes(5)),
			cancelJobMaps
			);
			// 车辆到达上车点时间
			xpOrder.setArrivalTime(LocalDateTime.now());
			break;
			case 5:
			// 删除定时任务job
			QuartzManager.removeJob((OrderCancelJob.name + xpOrder.getId()).toUpperCase(), TimeJobType.ORDER_CANCEL);
			break;
			case 6:
			// 行程开始时间
			xpOrder.setTripBegin(LocalDateTime.now());
			break;
			case 7:
			// 查询自动结束行程时间
			@@ -819,7 +825,7 @@
			);
			break;
			}
			baseMapper.updateById(xpOrder);
			this.updateById(xpOrder);
			return R.ok();
			}

	xp-robotaxi-api/src/main/java/com/xiaopeng/api/factory/order/XpOrderClientFallbackFactory.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPricingServiceImpl.java	13 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史