Commit 2952a647 authored by jiaorz's avatar jiaorz

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

parent 0cc595ff
...@@ -100,12 +100,12 @@ public class BackStageOrderController extends CommonBaseController implements Us ...@@ -100,12 +100,12 @@ public class BackStageOrderController extends CommonBaseController implements Us
Map<Integer, String> usernameMap = new HashMap<Integer, String>(); Map<Integer, String> usernameMap = new HashMap<Integer, String>();
Map<Integer, String> nicknameMap = new HashMap<Integer, String>(); Map<Integer, String> nicknameMap = new HashMap<Integer, String>();
if(objectRestResponse.getData() != null) { if(objectRestResponse.getData() != null) {
usernameMap = objectRestResponse.getData().stream() usernameMap = objectRestResponse.getData().stream().filter(a -> a == null)
.sorted(Comparator.comparing(AppUserVo::getUserid).reversed()) .sorted(Comparator.comparing(AppUserVo::getUserid).reversed())
.collect(Collectors.toMap(AppUserVo::getUserid, AppUserVo::getUsername, .collect(Collectors.toMap(AppUserVo::getUserid, AppUserVo::getUsername,
(oldValue, newValue) -> newValue, // 如果有相同的key,使用新key (oldValue, newValue) -> newValue, // 如果有相同的key,使用新key
LinkedHashMap::new)); LinkedHashMap::new));
nicknameMap = objectRestResponse.getData().stream() nicknameMap = objectRestResponse.getData().stream().filter(a -> a == null)
.sorted(Comparator.comparing(AppUserVo::getUserid).reversed()) .sorted(Comparator.comparing(AppUserVo::getUserid).reversed())
.collect(Collectors.toMap(AppUserVo::getUserid, AppUserVo::getNickname, .collect(Collectors.toMap(AppUserVo::getUserid, AppUserVo::getNickname,
(oldValue, newValue) -> newValue, // 如果有相同的key,使用新key (oldValue, newValue) -> newValue, // 如果有相同的key,使用新key
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment