java/Robotaxi.git

			@@ -12,6 +12,7 @@
			import com.xiaopeng.common.core.enums.MessageTemplateEnum;
			import com.xiaopeng.common.core.enums.OrderStatusEnum;
			import com.xiaopeng.common.core.exception.ServiceException;
			import com.xiaopeng.common.core.utils.StringUtils;
			import com.xiaopeng.common.redis.service.RedisService;
			import com.xiaopeng.order.service.IXpOrderService;
			import org.springframework.stereotype.Component;
			@@ -110,9 +111,7 @@
			* oldStatus 订单旧状态
			*/
			public void setCache_orderStatus(Long xpOrderId, XpOrder order ,OrderStatusEnum status) {
			if(order == null){
			order = xpOrderService.getById(xpOrderId);
			}
			order = xpOrderService.getById(xpOrderId);
			redisService.setCacheObject("ORDER_STATUS:" + xpOrderId, order.getStatus(), 24L, TimeUnit.HOURS);

			SendSubscribeMessageVo vo = new SendSubscribeMessageVo();
			@@ -130,7 +129,7 @@
			vo.setTemplateId(MessageTemplateEnum.E.getTemplateId());
			json = MessageTemplateEnum.E.getRemarks();
			json = json.replace("车牌号", plateNumber);
			json = json.replace("预计到达时间", LocalDateTime.now().toString());
			json = json.replace("报警时间", LocalDateTime.now().toString());
			}
			}else if(order.getStatus() == OrderStatusEnum.PICK_UP_GUESTS.getCode()) { //车辆到达上车点通知
			String plateNumber = null;
			@@ -143,7 +142,7 @@
			vo.setTemplateId(MessageTemplateEnum.E.getTemplateId());
			json = MessageTemplateEnum.E.getRemarks();
			json = json.replace("车牌号", plateNumber);
			json = json.replace("预计驶离时间", LocalDateTime.now().toString());
			json = json.replace("报警时间", LocalDateTime.now().toString());
			}

			}else{
			@@ -152,14 +151,21 @@
			OrderStatusEnum.SEE_OFF_GUESTS.getCode(),OrderStatusEnum.APPROVAL_REJECTION.getCode(),OrderStatusEnum.PENDING_PAYMENT.getCode(),
			OrderStatusEnum.COMPLETED.getCode()) ;
			if(statusList.contains(order.getStatus())){
			String bz = getBz(order);
			vo.setTemplateId(MessageTemplateEnum.A.getTemplateId());
			json = MessageTemplateEnum.A.getRemarks();
			json = json.replace("订单编号", order.getOrderNumber());
			json = json.replace("订单状态", OrderStatusEnum.getDescByCode(order.getStatus()));
			json = json.replace("备注", bz);
			json = json.replace("时间", LocalDateTime.now().toString());
			vo.setPage("");
			String plateNumber = null;
			// 查询车辆
			XpVehicle xpVehicle = xpVehicleClient.queryById(order.getVehicleId()).getData();
			if(xpVehicle != null){
			plateNumber = xpVehicle.getPlateNumber();
			}
			if(StringUtils.isNotEmpty(plateNumber)){
			String bz = getBz(order);
			vo.setTemplateId(MessageTemplateEnum.A.getTemplateId());
			json = MessageTemplateEnum.A.getRemarks();
			json = json.replace("订单编号", plateNumber);
			json = json.replace("订单状态", OrderStatusEnum.getDescByCode(order.getStatus()));
			json = json.replace("备注", bz);
			vo.setPage("");
			}
			}

			}