java/Robotaxi.git

			@@ -799,6 +799,10 @@
			lock.lock(10, TimeUnit.SECONDS);
			log.info("队列 {} 车辆 {} 单号 {}", quoteName, vehiclePositionVo.getVin(), orderNo);
			try {




			// VehiclePosition vehiclePosition = vehiclePositionService.findByVehicleId(vehiclePositionVo.getVehicle_id());
			R<XpVehicle> vehiclePositionR = xpVehicleClient.findByVehicleVin(vehiclePositionVo.getVin());
			if (vehiclePositionR.getCode() != 200) {
			@@ -810,6 +814,18 @@
			if (vehiclePosition.getOperatingStatus() != 1 \|\| vehiclePosition.getState() != 0 \|\| vehiclePosition.getVehicleType() == 1) {
			continue;
			}

			// 再次查询一下订单看是否取消
			xpOrderR = xpOrderClient.queryOrderByOrderNo(orderNo);
			if (xpOrderR.getCode() != 200) {
			continue;
			}
			xpOrder = xpOrderR.getData();
			if (xpOrder.getStatus() != 1) {
			continue;
			}


			// 关闭巡游单子
			R stringR = xpCruiseOrderClient.cancelCruiseOrderByVin(vehiclePosition.getVehicleVin());
			if (stringR == null \|\| stringR.getCode() != 200) {
			@@ -859,6 +875,18 @@
			if (vehicleId1.getOperatingStatus() != 1 \|\| vehicleId1.getState() != 0 \|\| vehicleId1.getVehicleType() == 1) {
			continue;
			}


			// 再次查询一下订单看是否取消
			xpOrderR = xpOrderClient.queryOrderByOrderNo(orderNo);
			if (xpOrderR.getCode() != 200) {
			continue;
			}
			xpOrder = xpOrderR.getData();
			if (xpOrder.getStatus() != 1) {
			continue;
			}

			// 关闭巡游单子
			R<?> stringR = xpCruiseOrderClient.cancelCruiseOrderByVin(vehicleId1.getVehicleVin());
			if (stringR == null \|\| stringR.getCode() != 200) {

	xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/order/XpPricingCardVo.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	xp-robotaxi-itinerary-boot/src/main/java/com/xiaopeng/itinerary/service/impl/XpPricingServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpPointManagementController.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java	28 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -61,4 +61,8 @@
			@ApiModelProperty("系统优惠金额Str")
			private String systemDiscountStr;


			@ApiModelProperty(value = "最终价格-字符串")
			private String finalFareStr;

			}

			@@ -384,6 +384,8 @@
			fareVo.setSystemDiscount(new BigDecimal(fareVo.getSystemDiscount() == null ? 0 : fareVo.getSystemDiscount()).setScale(2,RoundingMode.HALF_UP).doubleValue());
			routeAndFareVo.setFareEstimate(fareVo);

			routeAndFareVo.getXpPricingCard().setFinalFareStr(fareVo.getFinalFareStr());


			String voJsonStr = JSONObject.toJSONString(routeAndFareVo);
			// 进行缓存

			@@ -227,6 +227,7 @@
			throw new ServiceException("当前点位在禁行区内，不能启用。", I18nKeyConstant.POINT_ENABLE_IN_PROHIBITED_AREA);
			}
			}
			xpPoint.setFpElectronicAreaId(null);
			xpPointService.updateById(xpPoint);
			return R.ok();
			}