修改租車訂單地址，修改车辆预定时添加订单号

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BackStageOrderController.java

@@ -97,24 +97,17 @@ public class BackStageOrderController extends CommonBaseController implements Us
         if (userIds != null && userIds.size() > 0) {
             ObjectRestResponse<List<AppUserVo>> objectRestResponse = userFeign.getByUserIds(userIds);
             log.info("获取用户信息：objectRestResponse = {}", objectRestResponse.getData());
-            Map<Integer, String> usernameMap = new HashMap<Integer, String>();
-            Map<Integer, String> nicknameMap = new HashMap<Integer, String>();
+            Map<Integer, AppUserVo> appvoMap = new HashMap<Integer, AppUserVo>();
             if(objectRestResponse.getData() != null) {
-                usernameMap = objectRestResponse.getData().stream().filter(a -> a == null)
-                        .sorted(Comparator.comparing(AppUserVo::getUserid).reversed())
-                        .collect(Collectors.toMap(AppUserVo::getUserid, AppUserVo::getUsername,
-                                (oldValue, newValue) -> newValue,   // 如果有相同的key,使用新key
-                                LinkedHashMap::new));
-                nicknameMap = objectRestResponse.getData().stream().filter(a -> a == null)
-                        .sorted(Comparator.comparing(AppUserVo::getUserid).reversed())
-                        .collect(Collectors.toMap(AppUserVo::getUserid, AppUserVo::getNickname,
-                                (oldValue, newValue) -> newValue,   // 如果有相同的key,使用新key
-                                LinkedHashMap::new));
+                appvoMap = objectRestResponse.getData().stream().collect(Collectors.toMap(AppUserVo::getUserid, a -> a,(k1,k2)->k1));
             }
 
             for (OrderListVo orderPageVO : list) {
-                    orderPageVO.setTelephone(usernameMap.get(orderPageVO.getUserId()));
-                    orderPageVO.setUsername(nicknameMap.get(orderPageVO.getUserId()));
+                AppUserVo appUserVo = appvoMap.get(orderPageVO.getUserId());
+                if(appUserVo != null) {
+                    orderPageVO.setTelephone(appUserVo.getUsername());
+                    orderPageVO.setUsername(appUserVo.getNickname());
+                }
                 if (orderPageVO.getOrderRentVehicleDetail() != null && orderPageVO.getOrderRentVehicleDetail().getVehicleId() != null) {
                     RestResponse<Vehicle> restResponse = vehicleFeign.findById(orderPageVO.getOrderRentVehicleDetail().getVehicleId());
                     log.info("获取车辆信息返回消息：{}", restResponse.getMessage());