java/Robotaxi.git

			@@ -4489,19 +4489,19 @@
			vo.setOrderId(xpOrder.getId());
			vo.setOrderCreatedAt(xpOrder.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
			vo.setDispatchStartAt("");
			vo.setDispatchSuccessAt(xpOrder.getAcceptanceTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
			vo.setVehicleArrivedAt(xpOrder.getArrivalTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
			vo.setDispatchSuccessAt(null == xpOrder.getAcceptanceTime() ? "" : xpOrder.getAcceptanceTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
			vo.setVehicleArrivedAt(null == xpOrder.getArrivalTime() ? "" : xpOrder.getArrivalTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
			vo.setFreeWaitExpiredAt("");
			vo.setVehicleUnlockedAt("");
			vo.setDoorOpenedAt(Arrays.asList(""));
			vo.setDoorClosedAt(Arrays.asList(""));
			vo.setTripConfirmedAt(xpOrder.getTripBegin().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
			vo.setTripConfirmedAt(null == xpOrder.getTripBegin() ? "" : xpOrder.getTripBegin().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
			vo.setSafetybeltUnlockedAt(Arrays.asList(""));
			vo.setArrivedDestinationAt("");
			vo.setDropoffDoorOpenedAt(Arrays.asList(""));
			vo.setDropoffTrunkOpenedAt(Arrays.asList(""));
			vo.setDropoffDoorClosedAt(Arrays.asList(""));
			vo.setTripEndedAt(xpOrder.getTripEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
			vo.setTripEndedAt(null == xpOrder.getTripEnd() ? "" : xpOrder.getTripEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
			vo.setPaymentCompletedAt("");
			XpOrderEvaluate orderEvaluate = xpOrderEvaluateService.getOne(new QueryWrapper<XpOrderEvaluate>().eq("order_id", xpOrder.getId()));
			if(null != orderEvaluate){

	xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/model/vo/AppXpCruiseCheckInLocationVo.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpCruiseCheckInRuleServiceImpl.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -25,4 +25,6 @@
			private BigDecimal lat;
			@ApiModelProperty("地址")
			private String address;
			@ApiModelProperty("打开范围")
			private BigDecimal openRange;
			}

			@@ -131,6 +131,7 @@
			vo.setLon(xpCheckLocation.getLocationLon());
			vo.setLat(xpCheckLocation.getLocationLat());
			vo.setAddress(xpCheckLocation.getLocationAddress());
			vo.setOpenRange(xpCheckLocation.getLocationRange());
			appXpCruiseCheckInLocationVos.add(vo);
			}
			return appXpCruiseCheckInLocationVos;