From cb7be09dc82cdc3deed507a7ae3685e81f46e814 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 28 二月 2026 20:43:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderEvaluateServiceImpl.java | 31 +++++++++++++------------------
1 files changed, 13 insertions(+), 18 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 3d64646..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
@@ -11,7 +11,6 @@
import com.xiaopeng.api.feignClient.operation.XpSystemSettingClient;
import com.xiaopeng.api.feignClient.vehicleConvoy.XpVehicleClient;
import com.xiaopeng.api.model.account.XpAppUser;
-import com.xiaopeng.api.model.operation.XpFeedbackType;
import com.xiaopeng.api.model.operation.XpInvitationCode;
import com.xiaopeng.api.model.vehicleConvoy.XpVehicle;
import com.xiaopeng.api.model.order.XpOrder;
@@ -139,26 +138,22 @@
GetUserListByUidsVo getUserListByUidsVo = new GetUserListByUidsVo();
getUserListByUidsVo.setUids(userIds);
getUserListByUidsVo.setGetPreCarOwner(false);
- // todo 查不到用户信息
-// UserResourcesDto userListByUids = userResourcesClient.getUserListByUids(getUserListByUidsVo);
+ UserResourcesDto userListByUids = userResourcesClient.getUserListByUids(getUserListByUidsVo);
for (OrderEvaluateManagementPageListVO orderEvaluateManagementPageListVO : list) {
-// Object data = userListByUids.getData();
+ Object data = userListByUids.getData();
// 转化为jsonArray
-// JSONArray jsonArray = JSON.parseArray(JSON.toJSONString(data));
-// for (Object o : jsonArray) {
-// // 转化为JsonObject
-// JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(o));
-// String mobile = jsonObject.getString("mobile");
-// String nickName = jsonObject.getString("nickName");
-// String headImage = jsonObject.getString("headImage");
-// orderEvaluateManagementPageListVO.setPhoneNumber(mobile);
-// orderEvaluateManagementPageListVO.setNickName(nickName);
-// orderEvaluateManagementPageListVO.setHeadImage(headImage);
-// }
- XpFeedbackType feedbackType = systemSettingClient.getFeedbackTypeById(orderEvaluateManagementPageListVO.getFeedbackTypeId()).getData();
- if (feedbackType!=null){
- orderEvaluateManagementPageListVO.setFeedbackTypeName(feedbackType.getFeedbackType());
+ JSONArray jsonArray = JSON.parseArray(JSON.toJSONString(data));
+ for (Object o : jsonArray) {
+ // 转化为JsonObject
+ JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(o));
+ String mobile = jsonObject.getString("mobile");
+ String nickName = jsonObject.getString("nickName");
+ String headImage = jsonObject.getString("headImage");
+ orderEvaluateManagementPageListVO.setPhoneNumber(mobile);
+ orderEvaluateManagementPageListVO.setNickName(nickName);
+ orderEvaluateManagementPageListVO.setHeadImage(headImage);
}
+ systemSettingClient.getFeedbackTypeById(orderEvaluateManagementPageListVO.getFeedbackTypeId());
}
pageInfo.setRecords(list);
return pageInfo;
--
Gitblit v1.7.1