From e00bb855b266c7eec9499ba06aa78ea22dcec257 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 06 三月 2026 16:47:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 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 f9921f2..87edc32 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
@@ -1034,6 +1034,24 @@
             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", com.alibaba.fastjson2.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()));
+        xpPushMessageClient.sendStatus(sendMessageDTO);
+        log.info("订单取消消息推送完毕");
+
+        // 移除mongo数据
+        xpPricingClient.deleteXpGeoQueryEntity(order.getId().toString());
+
         // 下发命令
         if(order.getStatus()>1){
             PushOrderDto pushOrderDto = new PushOrderDto();
@@ -1083,6 +1101,9 @@
         xpPushMessageClient.sendStatus(sendMessageDTO);
         log.info("订单取消消息推送完毕");
 
+        // 移除mongo数据
+        xpPricingClient.deleteXpGeoQueryEntity(order.getId().toString());
+
         // 下发命令
         if(order.getStatus()>1){
             PushOrderDto pushOrderDto = new PushOrderDto();

--
Gitblit v1.7.1