From 1f9e89315641a68147eaf8e1d5e325bd6a4637c6 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 13 三月 2026 19:23:15 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi
---
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
index 16a872f..7f543eb 100644
--- a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
+++ b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
@@ -610,9 +610,9 @@
}
}
+ Long userId = order.getAppUserId();
if (order.getStatus() == 1) {
order.setStatus(0);
- Long userId = order.getAppUserId();
order.setAppUserId(null);
baseMapper.updateById(order);
// 消息推送
@@ -652,7 +652,7 @@
String message = JSONObject.toJSONString(params);
SendMessageDTO sendMessageDTO = new SendMessageDTO();
sendMessageDTO.setMessage(message);
- sendMessageDTO.setAppUserId(String.valueOf(order.getAppUserId()));
+ sendMessageDTO.setAppUserId(String.valueOf(userId));
xpPushMessageClient.sendStatus(sendMessageDTO);
//查询车辆信息
@@ -662,7 +662,7 @@
// 组装调用车机参数
CancelTaxiPassengerVo cancelTaxiPassengerVo = new CancelTaxiPassengerVo();
cancelTaxiPassengerVo.setVin(xpVehicle.getVehicleVin());
- cancelTaxiPassengerVo.setUid(order.getAppUserId().toString());
+ cancelTaxiPassengerVo.setUid(userId.toString());
cancelTaxiPassengerVo.setOrderNo(order.getOrderNumber());
cancelTaxiPassengerVo.setAppId(appid);
BaseVehicleUserDto baseVehicleUserDto = userVehicleClient.cancelTaxiPassenger(cancelTaxiPassengerVo);
@@ -1205,12 +1205,12 @@
content.put("orderId", order.getId().toString());
content.put("status", OrderStatusEnum.CANCELED.getCode());
params.put("type", PushMessageTypeEnum.ORDER_STATUS.getDesc());
- params.put("content", com.alibaba.fastjson2.JSONObject.toJSONString(content));
+ 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(String.valueOf(order.getAppUserId()));
+ sendMessageDTO.setAppUserId(uid);
xpPushMessageClient.sendStatus(sendMessageDTO);
log.info("订单取消消息推送完毕");
@@ -1227,7 +1227,7 @@
throw new ServiceException("车辆不存在", I18nKeyConstant.VEHICLE_NOT_EXISTS);
}
cancelTaxiPassengerVo.setVin(xpVehicle.getVehicleVin());
- cancelTaxiPassengerVo.setUid(order.getAppUserId().toString());
+ cancelTaxiPassengerVo.setUid(uid);
cancelTaxiPassengerVo.setOrderNo(order.getOrderNumber());
cancelTaxiPassengerVo.setAppId(appid);
@@ -1262,6 +1262,7 @@
if (order == null) {
throw new ServiceException("订单不存在", I18nKeyConstant.ORDER_NOT_EXISTS);
}
+ Long appUserId = order.getAppUserId();
order.setStatus(0);
order.setAppUserId(null);
baseMapper.updateById(order);
@@ -1275,32 +1276,30 @@
redisService.removeByPattern(order.getQueueName(), order.getOrderNumber());
-
// 消息推送
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", com.alibaba.fastjson2.JSONObject.toJSONString(content));
+ 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(String.valueOf(order.getAppUserId()));
+ sendMessageDTO.setAppUserId(String.valueOf(appUserId));
xpPushMessageClient.sendStatus(sendMessageDTO);
log.info("订单取消消息推送完毕");
// 移除mongo数据
xpPricingClient.deleteXpGeoQueryEntity(order.getId().toString());
- Long uid = order.getAppUserId();
// 设置当天的取消次数缓存
- Object cacheObject = redisService.getCacheObject("CANCEL_ORDER_" + uid);
+ Object cacheObject = redisService.getCacheObject("CANCEL_ORDER_" + appUserId);
if (cacheObject == null) {
- redisService.setCacheCancelOrder("CANCEL_ORDER_" + uid, 1);
+ redisService.setCacheCancelOrder("CANCEL_ORDER_" + appUserId, 1);
} else {
Integer i = Integer.valueOf(cacheObject.toString());
- redisService.setCacheCancelOrder("CANCEL_ORDER_" + uid, i + 1);
+ redisService.setCacheCancelOrder("CANCEL_ORDER_" + appUserId, i + 1);
}
return order;
}
--
Gitblit v1.7.1