From a6b0be5d9e6e21b050d1d46c30aa0200d82ec4d5 Mon Sep 17 00:00:00 2001 From: wayne <wayne8692wayne8692@gmail.com> Date: 星期六, 22 一月 2022 11:46:41 +0800 Subject: [PATCH] [update] [todo 134497] 批次處理尚未填寫滿意度的小鈴鐺通知 --- pamapi/src/main/java/com/pollex/pam/service/SatisfactionService.java | 77 ++++++++++++++++++++++++++++++-------- 1 files changed, 60 insertions(+), 17 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..9911f04 100644 --- a/pamapi/src/main/java/com/pollex/pam/service/SatisfactionService.java +++ b/pamapi/src/main/java/com/pollex/pam/service/SatisfactionService.java @@ -1,5 +1,6 @@ package com.pollex.pam.service; +import java.util.ArrayList; import java.util.List; import java.util.Optional; @@ -10,48 +11,74 @@ 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; + + @Autowired + PersonalNotificationService personalNotificationService; + + 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); + save(satisfaction); + personalNotificationService.createScorefactionToConsultant(satisfaction); + return 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 +89,20 @@ List<Satisfaction> satisfactionList = satisfactionRepository.findByCustomerId(customerDBId); return satisfactionMapper.toDTO(satisfactionList); } + + public Optional<Satisfaction> getByAppointmentId(Long appointmentId) { + return satisfactionRepository.findOneByAppointmentId(appointmentId); + } + + public List<Satisfaction> getByStatus(SatisfactionStatusEnum status) { + return satisfactionRepository.findAllByStatus(status); + } + + public List<Satisfaction> scoreAllfaction(List<SatisfactionCustomerScoreDTO> scoreDTO) { + List<Satisfaction> satisfactionList = new ArrayList<>(); + scoreDTO.stream().forEach(dto ->{ + satisfactionList.add(scorefaction(dto)); + }); + return satisfactionList; + } } -- Gitblit v1.8.0