From 08e656058e05bd89fa36de8d93bd59a079539123 Mon Sep 17 00:00:00 2001 From: wayne <wayne8692wayne8692@gmail.com> Date: 星期三, 09 二月 2022 18:00:12 +0800 Subject: [PATCH] [update] 服務地區恢復成用字串的方式給,並因匹配度改由後端做,因此把給全部顧問的api移除,繼續使用原快速篩選與嚴選配對的功能 --- pamapi/src/main/java/com/pollex/pam/service/SatisfactionService.java | 88 +++++++++++++++++++++++++++++++++++-------- 1 files changed, 71 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 0c0b5f8..0d8a786 100644 --- a/pamapi/src/main/java/com/pollex/pam/service/SatisfactionService.java +++ b/pamapi/src/main/java/com/pollex/pam/service/SatisfactionService.java @@ -1,21 +1,29 @@ package com.pollex.pam.service; +import java.util.ArrayList; 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; 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 @@ -36,33 +44,79 @@ @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 createSatisfaction(Appointment appointment) { - Satisfaction satisfaction = appointmentMapper.toSatisfaction(appointment); - return createSatisfaction(satisfaction); + public Satisfaction scorefaction(SatisfactionCustomerScoreDTO scoreDTO) { + 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(SatisfactionCustomerCreateDTO createDTO) { - // todo : 撠璅�歇�蝯∠���銝府�隞交憓遛��漲閰�� - // todo : ��撌梁���銝府�隞仿�脰���� - Satisfaction satisfaction = satisfactionDTOMapper.toSatisfaction(createDTO); - return createSatisfaction(satisfaction); + public Satisfaction createAppointmentSatisfaction(Appointment appointment) { + boolean isexist = getByAppointmentIdAndType(appointment.getId(), SatisfactionTypeEnum.APPOINTMENT).isPresent(); + if(isexist) { + throw new SatisfactionAlreadyExistException(); + } + Satisfaction satisfaction = appointmentMapper.toAppointmentSatisfaction(appointment); + return save(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); + 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> getByStatusAndType(SatisfactionStatusEnum status, SatisfactionTypeEnum type) { + return satisfactionRepository.findAllByStatusAndType(status, type); + } + + public List<Satisfaction> scoreAllfaction(List<SatisfactionCustomerScoreDTO> scoreDTO) { + List<Satisfaction> satisfactionList = new ArrayList<>(); + scoreDTO.stream().forEach(dto ->{ + satisfactionList.add(scorefaction(dto)); + }); + 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