|
@@ -134,10 +134,10 @@ public class ReservationServiceImpl extends ServiceImpl<ReservationMapper, Reser
|
|
.list();
|
|
.list();
|
|
List<ReservationDTO> reservations = ReservationCopier.INSTANCE.copying(list);
|
|
List<ReservationDTO> reservations = ReservationCopier.INSTANCE.copying(list);
|
|
reservations.forEach(item -> {
|
|
reservations.forEach(item -> {
|
|
- EmployeeDTO employeeDTO = this.employeeService.getEmployee(item.getUserId());
|
|
|
|
- if (employeeDTO != null) {
|
|
|
|
- item.setUsername(employeeDTO.getUsername());
|
|
|
|
- }
|
|
|
|
|
|
+// EmployeeDTO employeeDTO = this.employeeService.getEmployee(item.getUserId());
|
|
|
|
+// if (employeeDTO != null) {
|
|
|
|
+// item.setUsername(employeeDTO.getUsername());
|
|
|
|
+// }
|
|
MerchantDTO merchantDTO = this.merchantService.getMerchantById(item.getMerchantId());
|
|
MerchantDTO merchantDTO = this.merchantService.getMerchantById(item.getMerchantId());
|
|
item.setMerchant(merchantDTO);
|
|
item.setMerchant(merchantDTO);
|
|
});
|
|
});
|