From aa0f9381d424b98e86845c6da21e2fd8640fe056 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期一, 21 二月 2022 18:32:45 +0800
Subject: [PATCH] [update] 若顧問狀態非啟用時，則搜尋及推薦會找不到該顧問
---
pamapi/src/main/java/com/pollex/pam/service/SatisfactionService.java | 107 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 88 insertions(+), 19 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..1bf3c20 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/SatisfactionService.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/SatisfactionService.java
@@ -1,8 +1,13 @@
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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -10,51 +15,89 @@
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;
+import org.springframework.util.Assert;
@Service
@Transactional
public class SatisfactionService {
-
+
+ private static final Logger log = LoggerFactory.getLogger(SatisfactionService.class);
+
@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);
+ if(satisfaction.getType() == SatisfactionTypeEnum.APPOINTMENT) {
+ 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 = satisfactionRepository.findOneByAppointmentIdAndType(scoreDTO.getAppointmentId(), scoreDTO.getType());
+ Satisfaction satisfaction = satisfactionOP.orElseThrow(SatisfactionNotFoundException::new);
+
+ boolean isSameCustomer = satisfaction.getCustomerId().equals(SecurityUtils.getCustomerDBId());
+ Assert.isTrue(isSameCustomer, "The currently logged in customer has a different ID than the customer on Satisfaction");
+
+ satisfaction.setScore(scoreDTO.getScore());
+ satisfaction.setStatus(SatisfactionStatusEnum.FILLED);
+ save(satisfaction);
+
+ if(satisfaction.getType() == SatisfactionTypeEnum.APPOINTMENT) {
+ 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);
}
@@ -62,4 +105,30 @@
List<Satisfaction> satisfactionList = satisfactionRepository.findByCustomerId(customerDBId);
return satisfactionMapper.toDTO(satisfactionList);
}
+
+ 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 void createUnfilledSystemSatisfaction(Appointment appointment) {
+ Satisfaction satisfaction = new Satisfaction();
+ satisfaction.setAppointmentId(appointment.getId());
+ satisfaction.setCustomerId(SecurityUtils.getCustomerDBId());
+ satisfaction.setStatus(SatisfactionStatusEnum.UNFILLED);
+ satisfaction.setType(SatisfactionTypeEnum.SYSTEM);
+
+ satisfactionRepository.save(satisfaction);
+ }
}
--
Gitblit v1.8.0