From 4ecf545f43b6a2fff7d3e426a86411e620253221 Mon Sep 17 00:00:00 2001
From: yyy <1083599556@qq.com>
Date: 星期四, 23 四月 2026 22:29:05 +0800
Subject: [PATCH] 1.发送微信订阅通知 完成40% 2.通过围栏查询 场站 3.围栏详情查询 点位、场站信息 （总数量、启动中、待启动、已停用、已失效） 4.班次 需要增加一个是否跨天 5.修改接口， /map/base/v1/mini-program/cities/list 增加参数 type 1=围栏 2场站 添加场站是否收藏的字段 6.点位情况上报 详情增加上报人的角色
---
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 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 99d05be..e54939f 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
@@ -677,7 +677,7 @@
order.setAppUserId(null);
baseMapper.updateById(order);
order.setAppUserId(appUserId);
- redisService.setCacheObject("ORDER_STATUS:" + order.getId(), 0, 24L, TimeUnit.HOURS);
+ bootCommonService.setCache_orderStatus(order.getId(),order,null);
//删除蓝牙秘钥
String token = redisService.getCacheObject("rt:bluetooth:unlock:order:" + order.getId());
if(StringUtils.isNotBlank(token)){
@@ -730,7 +730,9 @@
// 1. 更新订单状态为已取消(0)
lambdaUpdate().set(XpOrder::getStatus, 0)
.eq(XpOrder::getId, order.getId()).update();
- redisService.setCacheObject("ORDER_STATUS:" + order.getId(), 0, 24L, TimeUnit.HOURS);
+ order.setStatus(OrderStatusEnum.CANCELED.getCode());
+
+ bootCommonService.setCache_orderStatus(order.getId(),order,null);
// 2. 保存取消记录
XpOrderCancel orderCancel = new XpOrderCancel();
@@ -840,7 +842,8 @@
Long appUserId = order.getAppUserId();
order.setAppUserId(null);
this.updateById(order);
- redisService.setCacheObject("ORDER_STATUS:" + order.getId(), 7, 24L, TimeUnit.HOURS);
+
+ bootCommonService.setCache_orderStatus(order.getId(),order,null);
// 消息推送
Map<String, Object> params1 = new HashMap<>();
@@ -1802,7 +1805,7 @@
order.setAppUserId(null);
baseMapper.updateById(order);
order.setAppUserId(appUserId);
- redisService.setCacheObject("ORDER_STATUS:" + order.getId(), 0, 24L, TimeUnit.HOURS);
+ bootCommonService.setCache_orderStatus(order.getId(),order,null);
//删除蓝牙秘钥
String token = redisService.getCacheObject("rt:bluetooth:unlock:order:" + order.getId());
if(StringUtils.isNotBlank(token)){
@@ -1841,7 +1844,7 @@
order.setAppUserId(null);
baseMapper.updateById(order);
order.setAppUserId(appUserId);
- redisService.setCacheObject("ORDER_STATUS:" + order.getId(), 0, 24L, TimeUnit.HOURS);
+ bootCommonService.setCache_orderStatus(order.getId(),order,null);
//删除蓝牙秘钥
String token = redisService.getCacheObject("rt:bluetooth:unlock:order:" + order.getId());
if(StringUtils.isNotBlank(token)){
@@ -1930,7 +1933,7 @@
xpOrder.setAppUserId(null);
xpOrder.setStatus(10);
baseMapper.updateById(xpOrder);
- redisService.setCacheObject("ORDER_STATUS:" + xpOrder.getId(), 10, 24L, TimeUnit.HOURS);
+ bootCommonService.setCache_orderStatus(xpOrder.getId(),xpOrder,null);
XpOrderEvaluate evaluate = new XpOrderEvaluate();
evaluate.setOrderId(xpOrder.getId());
@@ -2135,7 +2138,7 @@
xpOrder.setStatus(status);
xpOrder.setAppUserId(null);
this.updateById(xpOrder);
- redisService.setCacheObject("ORDER_STATUS:" + xpOrder.getId(), status, 24L, TimeUnit.HOURS);
+ bootCommonService.setCache_orderStatus(xpOrder.getId(),xpOrder,null);
return R.ok();
}
@@ -2203,7 +2206,7 @@
xpOrder1.setStatus(OrderStatusEnum.PENDING_PAYMENT.getCode());
xpOrder1.setUpdateTime(LocalDateTime.now());
baseMapper.updateById(xpOrder1);
- redisService.setCacheObject("ORDER_STATUS:" + id, xpOrder1.getStatus(), 24L, TimeUnit.HOURS);
+ bootCommonService.setCache_orderStatus(xpOrder1.getId(),xpOrder1,null);
}
@@ -2234,7 +2237,7 @@
order.setTripEnd(LocalDateTime.now());
baseMapper.updateById(order);
order.setAppUserId(appUserId);
- redisService.setCacheObject("ORDER_STATUS:" + order.getId(), 8, 24L, TimeUnit.HOURS);
+ bootCommonService.setCache_orderStatus(order.getId(),order,null);
//删除蓝牙秘钥
String token = redisService.getCacheObject("rt:bluetooth:unlock:order:" + orderId);
if(StringUtils.isNotBlank(token)){
@@ -3133,7 +3136,7 @@
}
}
baseMapper.updateById(order);
- redisService.setCacheObject("ORDER_STATUS:" + order.getId(), 9, 24L, TimeUnit.HOURS);
+ bootCommonService.setCache_orderStatus(order.getId(),order,null);
return R.ok();
}
@@ -3407,10 +3410,12 @@
order.setAcceptanceTime(LocalDateTime.now());
R<XpVehicle> byVehicleVin = xpVehicleClient.findByVehicleVin(dto.getXpVehicleVin());
XpVehicle vehicle = null;
+ String plateNumber = null;
if (byVehicleVin.getCode() == 200) {
vehicle = byVehicleVin.getData();
order.setVehicleId(vehicle.getId());
order.setFleetId(vehicle.getFleetId());
+ plateNumber = vehicle.getPlateNumber();
addTaxiPassengerVo.setVin(vehicle.getVehicleVin());
}
order.setStatus(2);
@@ -3435,7 +3440,7 @@
addTaxiPassengerVo.setUid(appUserId.toString());
order.setAppUserId(null);
this.updateById(order);
- redisService.setCacheObject("ORDER_STATUS:" + order.getId(), 2, 24L, TimeUnit.HOURS);
+ bootCommonService.setCache_orderStatus(order.getId(),order,null);
//构建推送消息
Map<String, Object> params = new HashMap<>();
@@ -3469,9 +3474,7 @@
}
});
}
-
-
- redisService.setCacheObject("ORDER_STATUS:" + order.getId(), 2, 24L, TimeUnit.HOURS);
+// redisService.setCacheObject("ORDER_STATUS:" + order.getId(), 2, 24L, TimeUnit.HOURS);//没看懂为啥重复 缓存
addTaxiPassengerVo.setOrderNo(order.getOrderNumber());
addTaxiPassengerVo.setAppId(appid);
userVehicleClient.addTaxiPassenger(addTaxiPassengerVo);
--
Gitblit v1.7.1