From 21d79d2a70b095545477472438d27a8827ee80b8 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期四, 10 二月 2022 14:01:00 +0800
Subject: [PATCH] [update] 嚴選搜尋新增匹配度分數
---
pamapi/src/main/java/com/pollex/pam/service/SatisfactionService.java | 38 ++++++++++++++++++++++++++------------
1 files changed, 26 insertions(+), 12 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 9911f04..0d8a786 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/SatisfactionService.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/SatisfactionService.java
@@ -4,6 +4,9 @@
import java.util.List;
import java.util.Optional;
+import com.pollex.pam.enums.SatisfactionTypeEnum;
+import com.pollex.pam.security.SecurityUtils;
+import com.pollex.pam.service.dto.SatisfactionSystemScoreDTO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -57,21 +60,22 @@
}
public Satisfaction scorefaction(SatisfactionCustomerScoreDTO scoreDTO) {
- Optional<Satisfaction> satisfactionOP = getByAppointmentId(scoreDTO.getAppointmentId());
+ Optional<Satisfaction> satisfactionOP = getByAppointmentIdAndType(scoreDTO.getAppointmentId(), SatisfactionTypeEnum.APPOINTMENT);
Satisfaction satisfaction = satisfactionOP.orElseThrow(SatisfactionNotFoundException::new);
satisfaction.setScore(scoreDTO.getScore());
satisfaction.setStatus(SatisfactionStatusEnum.FILLED);
+ satisfaction.setType(SatisfactionTypeEnum.APPOINTMENT);
save(satisfaction);
personalNotificationService.createScorefactionToConsultant(satisfaction);
return satisfaction;
}
- public Satisfaction createSatisfaction(Appointment appointment) {
- boolean isexist = getByAppointmentId(appointment.getId()).isPresent();
+ public Satisfaction createAppointmentSatisfaction(Appointment appointment) {
+ boolean isexist = getByAppointmentIdAndType(appointment.getId(), SatisfactionTypeEnum.APPOINTMENT).isPresent();
if(isexist) {
throw new SatisfactionAlreadyExistException();
}
- Satisfaction satisfaction = appointmentMapper.toSatisfaction(appointment);
+ Satisfaction satisfaction = appointmentMapper.toAppointmentSatisfaction(appointment);
return save(satisfaction);
}
//
@@ -80,22 +84,22 @@
// return save(satisfaction);
// }
- public List<SatisfactionDTO> getByAgentNo(String agentNo) {
- List<Satisfaction> satisfactionList = satisfactionRepository.findByAgentNo(agentNo);
+ public List<SatisfactionDTO> getByAgentNoAndType(String agentNo, SatisfactionTypeEnum type) {
+ List<Satisfaction> satisfactionList = satisfactionRepository.findByAgentNoAndType(agentNo, type);
return satisfactionMapper.toDTO(satisfactionList);
}
- public List<SatisfactionDTO> getByCustomerId(Long customerDBId) {
- List<Satisfaction> satisfactionList = satisfactionRepository.findByCustomerId(customerDBId);
+ public List<SatisfactionDTO> getByCustomerIdAndType(Long customerDBId, SatisfactionTypeEnum type) {
+ List<Satisfaction> satisfactionList = satisfactionRepository.findByCustomerIdAndType(customerDBId, type);
return satisfactionMapper.toDTO(satisfactionList);
}
- public Optional<Satisfaction> getByAppointmentId(Long appointmentId) {
- return satisfactionRepository.findOneByAppointmentId(appointmentId);
+ public Optional<Satisfaction> getByAppointmentIdAndType(Long appointmentId, SatisfactionTypeEnum type) {
+ return satisfactionRepository.findOneByAppointmentIdAndType(appointmentId, type);
}
- public List<Satisfaction> getByStatus(SatisfactionStatusEnum status) {
- return satisfactionRepository.findAllByStatus(status);
+ public List<Satisfaction> getByStatusAndType(SatisfactionStatusEnum status, SatisfactionTypeEnum type) {
+ return satisfactionRepository.findAllByStatusAndType(status, type);
}
public List<Satisfaction> scoreAllfaction(List<SatisfactionCustomerScoreDTO> scoreDTO) {
@@ -105,4 +109,14 @@
});
return satisfactionList;
}
+
+ public Satisfaction createSystemSatisfaction(SatisfactionSystemScoreDTO scoreDTO) {
+ Satisfaction satisfaction = new Satisfaction();
+ satisfaction.setCustomerId(SecurityUtils.getCustomerDBId());
+ satisfaction.setAppointmentId(scoreDTO.getAppointmentId());
+ satisfaction.setStatus(SatisfactionStatusEnum.FILLED);
+ satisfaction.setScore(scoreDTO.getScore());
+ satisfaction.setType(SatisfactionTypeEnum.SYSTEM);
+ return satisfactionRepository.save(satisfaction);
+ }
}
--
Gitblit v1.8.0