|
|
|
@ -174,12 +174,12 @@ public class RecycleOrderController {
|
|
|
|
|
detailResponseVOList.stream().collect(Collectors.groupingBy(RecycleOrderDetailResponseVO::getRecycleOrderId));
|
|
|
|
|
// 地址关联信息
|
|
|
|
|
Map<String, String> orderAddressMap = orderRespVOList.stream().collect(Collectors.toMap(
|
|
|
|
|
RecycleOrderRespVO::getId, RecycleOrderRespVO::getClientAddressId));
|
|
|
|
|
RecycleOrderRespVO::getId, v -> Optional.ofNullable(v.getClientAddressId()).orElse(""), (k1, k2) -> k1));
|
|
|
|
|
Set<String> addressIds = new HashSet<>(orderAddressMap.values());
|
|
|
|
|
List<ClientAddress> clientAddresses = clientAddressService.queryAddressList(addressIds);
|
|
|
|
|
List<ClientAddressSimpleVO> addressSimpleVOList = BeanUtils.copyList(clientAddresses, ClientAddressSimpleVO.class);
|
|
|
|
|
Map<String, ClientAddressSimpleVO> clientAddressMap = addressSimpleVOList.stream().collect(Collectors.toMap(
|
|
|
|
|
ClientAddressSimpleVO::getId, cas -> cas));
|
|
|
|
|
ClientAddressSimpleVO::getId, v -> v, (k1, k2) -> k1));
|
|
|
|
|
for (RecycleOrderRespVO orderRespVO : orderRespVOList) {
|
|
|
|
|
this.computeOrderDistance(orderRespVO, locationDTO);
|
|
|
|
|
List<RecycleOrderDetailResponseVO> orderDetails = orderProductsMap.get(orderRespVO.getId());
|
|
|
|
|