From a13e95b7803693cf39fdcf1a5c21b961a6d66485 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 27 三月 2026 18:37:17 +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 | 15 +++++++++++++++
1 files changed, 15 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 6251b0c..e645156 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
@@ -1031,6 +1031,8 @@
if (Objects.nonNull(newFleetId)) {
order.setFleetId(newFleetId);
}
+ //重置订单状态为【待接单】
+ order.setStatus(1);
this.updateById(order);
// 10. 保存改派记录
@@ -1088,6 +1090,19 @@
log.info("管理后台改派订单，车辆状态修改1 {}", newVehicle.getPlateNumber());
log.info("已将新车辆状态设为已接单，车辆ID: {}", newVehicleId);
+ //12.向小程序用户推送订单改派通知
+ Map<String, Object> params = new HashMap<>();
+ Map<String, Object> content = new HashMap<>();
+ content.put("orderId", order.getId().toString());
+ content.put("status", order.getStatus());
+ params.put("type", PushMessageTypeEnum.ORDER_REASSIGN.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);
} catch (Exception e) {
log.error("处理新车辆失败，车辆ID: {}，错误: {}", newVehicleId, e.getMessage());
}
--
Gitblit v1.7.1