java/Robotaxi.git

			@@ -874,6 +874,14 @@
			case ORDER_CANCELLED:
			//已取消
			if(!orderId.contains("XU")){
			//判断订单状态，已经取消的不作处理
			Object cacheObject = redisService.getCacheObject("ORDER_STATUS:" + orderId);
			if(null != cacheObject){
			int order_status = Integer.parseInt(cacheObject.toString());
			if(0 == order_status){
			return;
			}
			}
			//行程中取消订单，按照行程结束处理
			buildPushOrderStatus(orderId, OrderStatusEnum.SEE_OFF_GUESTS, sequence);
			xpOrderClient.updateOrderStatus(Long.parseLong(orderId), OrderStatusEnum.SEE_OFF_GUESTS.getCode());

			@@ -41,12 +41,15 @@
			cancelTaxiPassengerVo.setOrderNo(xpOrder.getOrderNumber());
			cancelTaxiPassengerVo.setAppId(appid);
			userVehicleClient.cancelTaxiPassenger(cancelTaxiPassengerVo);
			log.info("车辆到达终点后的定时任务解绑用户和车辆关系 {}", xpOrder.getOrderNumber());

			// 修改车辆接单状态
			vehicle.setState(0);
			xpVehicleClient.updateVehicleById(vehicle);
			log.info("车辆到达终点后的定时任务回滚车辆状态为空闲 {}", xpOrder.getOrderNumber());
			}
			xpOrderService.addCruiseMission(vehicle, xpOrder);
			log.info("车辆到达终点后的定时任务给车辆派巡游单 {}", xpOrder.getOrderNumber());
			}

			}

			@@ -1303,21 +1303,6 @@
			redisService.setCacheCancelOrder("CANCEL_ORDER_" + uid, i + 1);
			}

			// 消息推送
			// Map<String, Object> params = new HashMap<>();
			// Map<String, Object> content = new HashMap<>();
			// content.put("orderId", order.getId().toString());
			// content.put("status", OrderStatusEnum.CANCELED.getCode());
			// params.put("type", PushMessageTypeEnum.ORDER_STATUS.getDesc());
			// params.put("content", JSONObject.toJSONString(content));
			// params.put("timestamp", new Date().getTime() + "");
			// String message = JSONObject.toJSONString(params);
			// SendMessageDTO sendMessageDTO = new SendMessageDTO();
			// sendMessageDTO.setMessage(message);
			// sendMessageDTO.setAppUserId(uid);
			// xpPushMessageClient.sendStatus(sendMessageDTO);
			// log.info("订单取消消息推送完毕");

			// 移除mongo数据
			xpPricingClient.deleteXpGeoQueryEntity(order.getId().toString());

			@@ -1585,7 +1570,7 @@
			endTripJobMaps
			);
			// 添加车辆到达终点后限停时间到后驶离的定时任务
			//时间到后添加巡游订单，解绑车辆关系，车辆驶离点位
			//时间到后将车辆状态回滚到空闲、添加巡游订单，解绑用户和车辆关系，车辆驶离点位
			XpPoint point = xpPointClient.queryById(xpOrder.getEndPointId()).getData();
			Map<String, ? extends Object> jobMaps =
			new ImmutableMap.Builder<String, String>()

	xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/service/KafkaConsumerService.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/job/jobs/AddCruiseMissionJob.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java	17 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史