From c0fd5072a4df90ec5d3cbdc52b060514605d292b Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期二, 30 十一月 2021 10:49:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pamapi/src/main/java/com/pollex/pam/service/AppointmentService.java | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/pamapi/src/main/java/com/pollex/pam/service/AppointmentService.java b/pamapi/src/main/java/com/pollex/pam/service/AppointmentService.java
index 0da3432..b23f88e 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/AppointmentService.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/AppointmentService.java
@@ -16,7 +16,6 @@
import com.pollex.pam.service.dto.AppointmentCustomerViewDTO;
import com.pollex.pam.service.mapper.AppointmentCustomerViewMapper;
import com.pollex.pam.service.mapper.AppointmentDTOMapper;
-import com.pollex.pam.service.mapper.AppointmentMapper;
import com.pollex.pam.web.rest.errors.AppointmentNotFoundException;
@Service
@@ -28,20 +27,19 @@
@Autowired
AppointmentDTOMapper appointmentDTOMapper;
-
+
@Autowired
ConsultantService consultantService;
-
+
@Autowired
AppointmentCustomerViewMapper appointmentCustomerViewMapper;
-
+
@Autowired
AppointmentCustomerViewRepository appointmentCustomerViewRepository;
-
-
+
public void customerCreateAppointment(AppointmentCreateDTO appointmentCreateDTO) {
Appointment appointment = appointmentDTOMapper.toAppointment(appointmentCreateDTO);
- appointment.setCustomerId(SecurityUtils.getCustomerId());
+ appointment.setCustomerId(SecurityUtils.getCustomerDBId());
appointment.setCommunicateStatus(ContactStatusEnum.RESERVED);
appointmentRepository.save(appointment);
}
@@ -51,8 +49,8 @@
}
public void markAsContacted(Long appointmentId) {
-
- Appointment appointment = appointmentRepository.getById(appointmentId);
+
+ Appointment appointment = appointmentRepository.findById(appointmentId).get();
appointment.setCommunicateStatus(ContactStatusEnum.CONTACTED);
appointmentRepository.save(appointment);
}
@@ -63,7 +61,7 @@
.orElseThrow(AppointmentNotFoundException::new);
return appointmentCustomerViewMapper.toAppointmentCustomerViewDTO(appointment);
}
-
+
public List<Appointment> findByAgentNoAndCustomerId(String agentNo, Long customerId) {
return appointmentRepository.findByAgentNoAndCustomerId(agentNo, customerId);
--
Gitblit v1.8.0