From 2dc7dcf5b21d230fc4ab66449df5f30592f0543f Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期六, 28 二月 2026 16:02:29 +0800
Subject: [PATCH] fix:接口联调修改
---
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderEvaluateServiceImpl.java | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderEvaluateServiceImpl.java b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderEvaluateServiceImpl.java
index 9488397..38bc5a1 100644
--- a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderEvaluateServiceImpl.java
+++ b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderEvaluateServiceImpl.java
@@ -16,6 +16,7 @@
import com.xiaopeng.api.model.order.XpOrder;
import com.xiaopeng.api.model.order.XpOrderEvaluate;
import com.xiaopeng.api.vo.account.GetUserListByUidsVo;
+import com.xiaopeng.common.core.constant.HttpStatus;
import com.xiaopeng.common.core.domain.R;
import com.xiaopeng.common.core.utils.StringUtils;
import com.xiaopeng.common.core.web.page.PageInfo;
@@ -109,13 +110,13 @@
}
// 4. 批量查询关联数据
- Map<Long, XpAppUser> userMap = batchGetUsers(userIds);
+ JSONObject jsonObject = batchGetUsers(userIds);
Map<Long, XpVehicle> vehicleMap = batchGetVehicles(vehicleIds);
Map<Long, XpOrder> orderMap = batchGetOrders(orderIds);
// 5. 根据查询条件过滤（手机号、车牌号）
List<OrderEvaluatePageVO> voList = evaluatePage.getRecords().stream()
- .map(evaluate -> convertToPageVO(evaluate, userMap, vehicleMap, orderMap))
+ .map(evaluate -> convertToPageVO(evaluate, jsonObject, vehicleMap, orderMap))
.filter(vo -> filterByQuery(vo, query))
.collect(Collectors.toList());
@@ -161,20 +162,22 @@
/**
* 批量获取用户信息
*/
- private Map<Long, XpAppUser> batchGetUsers(Set<Long> userIds) {
+ private JSONObject batchGetUsers(Set<Long> userIds) {
if (CollectionUtils.isEmpty(userIds)) {
- return new HashMap<>();
+ return new JSONObject();
}
try {
- R<List<XpAppUser>> result = xpAppUserClient.listByIds(new ArrayList<>(userIds));
- if (Objects.nonNull(result) && Objects.nonNull(result.getData())) {
- return result.getData().stream()
- .collect(Collectors.toMap(XpAppUser::getId, Function.identity(), (a, b) -> a));
+ GetUserListByUidsVo getUserListByUidsVo = new GetUserListByUidsVo();
+ getUserListByUidsVo.setUids(new ArrayList<>(userIds));
+ getUserListByUidsVo.setGetPreCarOwner(Boolean.TRUE);
+ UserResourcesDto userListByUids = userResourcesClient.getUserListByUids(getUserListByUidsVo);
+ if (userListByUids.getCode().equals(HttpStatus.SUCCESS)) {
+ return JSONObject.parseObject(userListByUids.getData().toString());
}
} catch (Exception e) {
log.error("批量获取用户信息失败: {}", e.getMessage());
}
- return new HashMap<>();
+ return new JSONObject();
}
/**
@@ -212,7 +215,7 @@
* VO转换
*/
private OrderEvaluatePageVO convertToPageVO(XpOrderEvaluate evaluate,
- Map<Long, XpAppUser> userMap,
+ JSONObject jsonObject,
Map<Long, XpVehicle> vehicleMap,
Map<Long, XpOrder> orderMap) {
OrderEvaluatePageVO vo = new OrderEvaluatePageVO();
@@ -224,10 +227,10 @@
vo.setEvaluateTime(evaluate.getEvaluateTime());
// 用户信息
- if (Objects.nonNull(evaluate.getAppUserId()) && userMap.containsKey(evaluate.getAppUserId())) {
- XpAppUser user = userMap.get(evaluate.getAppUserId());
- vo.setNickName(user.getNickName());
- vo.setPhoneNumber(user.getPhoneNumber());
+ if (Objects.nonNull(evaluate.getAppUserId()) && jsonObject.containsKey(evaluate.getAppUserId().toString())) {
+ JSONObject userInfo = jsonObject.getJSONObject(evaluate.getAppUserId().toString());
+ vo.setNickName(userInfo.getString("nickName"));
+ vo.setPhoneNumber(userInfo.getString("mobile"));
}
// 车辆信息
--
Gitblit v1.7.1