|
@@ -517,9 +517,10 @@ public class OrderInfoService {
|
|
|
dto.setRiderName(rider.getUser().getNickname());
|
|
dto.setRiderName(rider.getUser().getNickname());
|
|
|
dto.setRUserId(rider.getUserId());
|
|
dto.setRUserId(rider.getUserId());
|
|
|
});
|
|
});
|
|
|
- RiderLocation location = riderLocationRepo.findLastByRiderId(riderId)
|
|
|
|
|
- .orElseThrow(new BusinessException("无骑手位置"));
|
|
|
|
|
- dto.setLocation(location.getLongitude() + "," + location.getLatitude());
|
|
|
|
|
|
|
+ riderLocationRepo.findLastByRiderId(riderId)
|
|
|
|
|
+ .ifPresent(lo ->
|
|
|
|
|
+ dto.setLocation(lo.getLongitude() + "," + lo.getLatitude()));
|
|
|
|
|
+
|
|
|
}
|
|
}
|
|
|
dto.setNickname(orderInfo.getUser().getNickname());
|
|
dto.setNickname(orderInfo.getUser().getNickname());
|
|
|
// userRepo.findById(orderInfo.getUserId()).ifPresent(u -> dto.setNickname(u.getNickname()));
|
|
// userRepo.findById(orderInfo.getUserId()).ifPresent(u -> dto.setNickname(u.getNickname()));
|