From f5831acafe510f9a79f8e2ecf6dee09026d67fc6 Mon Sep 17 00:00:00 2001
From: HelenHuang <LinHuang@pollex.com.tw>
Date: 星期四, 20 一月 2022 16:09:09 +0800
Subject: [PATCH] Merge branch 'Phase3' of https://dev.pollex.com.tw:8443/r/pcalife/PAM into Phase3
---
pamapi/src/main/java/com/pollex/pam/service/SatisfactionService.java | 58 ++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 42 insertions(+), 16 deletions(-)
diff --git a/pamapi/src/main/java/com/pollex/pam/service/SatisfactionService.java b/pamapi/src/main/java/com/pollex/pam/service/SatisfactionService.java
index 58e5650..70de68f 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/SatisfactionService.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/SatisfactionService.java
@@ -10,48 +10,70 @@
import com.pollex.pam.domain.Appointment;
import com.pollex.pam.domain.Satisfaction;
import com.pollex.pam.enums.SatisfactionStatusEnum;
+import com.pollex.pam.repository.ConsultantRepository;
import com.pollex.pam.repository.CustomerRepository;
import com.pollex.pam.repository.SatisfactionRepository;
-import com.pollex.pam.service.dto.SatisfactionCustomerCreateDTO;
+import com.pollex.pam.service.dto.SatisfactionCustomerScoreDTO;
import com.pollex.pam.service.dto.SatisfactionDTO;
import com.pollex.pam.service.mapper.AppointmentMapper;
import com.pollex.pam.service.mapper.SatisfactionDTOMapper;
import com.pollex.pam.service.mapper.SatisfactionMapper;
+import com.pollex.pam.web.rest.errors.SatisfactionAlreadyExistException;
+import com.pollex.pam.web.rest.errors.SatisfactionNotFoundException;
@Service
@Transactional
public class SatisfactionService {
-
+
@Autowired
SatisfactionRepository satisfactionRepository;
-
+
@Autowired
AppointmentMapper appointmentMapper;
-
+
@Autowired
SatisfactionDTOMapper satisfactionDTOMapper;
-
+
@Autowired
SatisfactionMapper satisfactionMapper;
-
+
@Autowired
CustomerRepository customerRepository;
- public Satisfaction createSatisfaction(Satisfaction satisfaction) {
- return satisfactionRepository.save(satisfaction);
+ @Autowired
+ ConsultantRepository consultantRepository;
+
+ @Autowired
+ ConsultantService consultantService;
+
+ public Satisfaction save(Satisfaction satisfaction) {
+ satisfaction = satisfactionRepository.save(satisfaction);
+ consultantService.setConsultantAvgScore(satisfaction);
+ return satisfaction;
+ }
+
+ public Satisfaction scorefaction(SatisfactionCustomerScoreDTO scoreDTO) {
+ Optional<Satisfaction> satisfactionOP = getByAppointmentId(scoreDTO.getAppointmentId());
+ Satisfaction satisfaction = satisfactionOP.orElseThrow(SatisfactionNotFoundException::new);
+ satisfaction.setScore(scoreDTO.getScore());
+ satisfaction.setStatus(SatisfactionStatusEnum.FILLED);
+ return save(satisfaction);
}
+
public Satisfaction createSatisfaction(Appointment appointment) {
+ boolean isexist = getByAppointmentId(appointment.getId()).isPresent();
+ if(isexist) {
+ throw new SatisfactionAlreadyExistException();
+ }
Satisfaction satisfaction = appointmentMapper.toSatisfaction(appointment);
- return createSatisfaction(satisfaction);
+ return save(satisfaction);
}
-
- public Satisfaction createSatisfaction(SatisfactionCustomerCreateDTO createDTO) {
- // todo : 撠璅�歇�蝯∠���銝府�隞交憓遛��漲閰��
- // todo : ��撌梁���銝府�隞仿�脰����
- Satisfaction satisfaction = satisfactionDTOMapper.toSatisfaction(createDTO);
- return createSatisfaction(satisfaction);
- }
+//
+// public Satisfaction createSatisfaction(SatisfactionCustomerScoreDTO createDTO) {
+// Satisfaction satisfaction = satisfactionDTOMapper.toSatisfaction(createDTO);
+// return save(satisfaction);
+// }
public List<SatisfactionDTO> getByAgentNo(String agentNo) {
List<Satisfaction> satisfactionList = satisfactionRepository.findByAgentNo(agentNo);
@@ -62,4 +84,8 @@
List<Satisfaction> satisfactionList = satisfactionRepository.findByCustomerId(customerDBId);
return satisfactionMapper.toDTO(satisfactionList);
}
+
+ public Optional<Satisfaction> getByAppointmentId(Long appointmentId) {
+ return satisfactionRepository.findOneByAppointmentId(appointmentId);
+ }
}
--
Gitblit v1.8.0