From 45be9d5d27748979e2081b46acbf74011f2b283b Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 21 三月 2026 12:20:24 +0800
Subject: [PATCH] 修改bug和优化推送消息触发的先后顺序

---
 xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java |   17 +----------------
 1 files changed, 1 insertions(+), 16 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 80d9c4c..2b72d60 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
@@ -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>()

--
Gitblit v1.7.1