From 82e2a62e7c90cc191f9e2ebc569fe3a3663b68b0 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期五, 03 十二月 2021 11:19:00 +0800
Subject: [PATCH] Merge branch '預約單更新與刪除'
---
pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java | 157 ++++++++++++++++++++++++++++++++++++----------------
1 files changed, 109 insertions(+), 48 deletions(-)
diff --git a/pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java b/pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java
index 96a6383..7a9c552 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java
@@ -1,68 +1,107 @@
package com.pollex.pam.service;
-import com.pollex.pam.domain.Appointment;
import com.pollex.pam.domain.AppointmentCustomerView;
import com.pollex.pam.domain.Consultant;
-import com.pollex.pam.domain.CustomFavoriteConsultant;
-import com.pollex.pam.domain.User;
+import com.pollex.pam.domain.CustomerFavoriteConsultant;
+import com.pollex.pam.domain.Satisfaction;
import com.pollex.pam.enums.ContactStatusEnum;
-import com.pollex.pam.repository.AppointmentCustomerViewRepository;
+import com.pollex.pam.enums.LoginResult;
import com.pollex.pam.repository.ConsultantRepository;
-import com.pollex.pam.repository.CustomFavoriteConsultantRepository;
+import com.pollex.pam.repository.CustomerFavoriteConsultantRepository;
import com.pollex.pam.security.SecurityUtils;
import com.pollex.pam.service.dto.*;
import com.pollex.pam.service.mapper.AppointmentCustomerViewMapper;
-import com.pollex.pam.service.mapper.AppointmentMapper;
import com.pollex.pam.service.mapper.ConsultantMapper;
import com.pollex.pam.web.rest.errors.ConsultantNotFoundException;
-import com.pollex.pam.web.rest.errors.NotLoginException;
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;
-import java.util.Collections;
+import java.util.Comparator;
import java.util.List;
+import java.util.Optional;
import java.util.stream.Collectors;
@Service
public class ConsultantService {
- private final static Logger log = LoggerFactory.getLogger(ConsultantService.class);
+ private static final Logger log = LoggerFactory.getLogger(ConsultantService.class);
- private final ConsultantRepository consultantRepository;
- private final CustomFavoriteConsultantRepository customFavoriteConsultantRepository;
- private final ConsultantMapper consultantMapper;
- private final UserService userService;
-
+ @Autowired
+ ConsultantRepository consultantRepository;
+
+ @Autowired
+ CustomerFavoriteConsultantRepository customerFavoriteConsultantRepository;
+
+ @Autowired
+ ConsultantMapper consultantMapper;
+
@Autowired
AppointmentService appointmentService;
-
+
@Autowired
- AppointmentCustomerViewRepository appointmentCustomerViewRepository;
-
+ LoginRecordService loginRecordService;
+
@Autowired
AppointmentCustomerViewMapper appointmentCustomerViewMapper;
-
- public ConsultantService(
- ConsultantRepository consultantRepository,
- CustomFavoriteConsultantRepository customFavoriteConsultantRepository,
- ConsultantMapper consultantMapper,
- UserService userService
- ) {
- this.consultantRepository = consultantRepository;
- this.customFavoriteConsultantRepository = customFavoriteConsultantRepository;
- this.consultantMapper = consultantMapper;
- this.userService = userService;
+
+ @Autowired
+ SatisfactionService satisfactionService;
+
+ public List<CustomerFavoriteConsultantDTO> getMyConsultantList() {
+ Long customerId = SecurityUtils.getCustomerDBId();
+
+ return customerFavoriteConsultantRepository.findAllByCustomerId(customerId)
+ .stream()
+ .map(customerFavoriteConsultantRelation -> {
+ Consultant consultant = customerFavoriteConsultantRelation.getConsultant();
+ CustomerFavoriteConsultantDTO dto = consultantMapper.toCustomerFavoriteConsultantDto(consultant);
+
+ dto.setContactStatus(ContactStatusEnum.PICKED);
+ dto.setLatestAppointmentId(null);
+ dto.setLatestAppointmentDate(null);
+ dto.setLatestAppointmentScore(null);
+ dto.setCreateTime(customerFavoriteConsultantRelation.getLastModifiedDate());
+
+ setAppointmentInfo(
+ dto,
+ appointmentService.findAvailableByAgentNoAndCustomerId(consultant.getAgentNo(), customerId)
+ );
+
+ return dto;
+
+ }).collect(Collectors.toList());
}
- public List<ConsultantDTO> getMyConsultantList() {
- User user = userService.getUserWithAuthorities().orElseThrow(NotLoginException::new);
- return customFavoriteConsultantRepository.findAllByCustomId(user.getId())
- .stream()
- .map(consultantMapper::toDto)
+ private void setAppointmentInfo(CustomerFavoriteConsultantDTO dto, List<AppointmentCustomerView> appointmentList) {
+ List<AppointmentCustomerView> appointments = appointmentList.stream()
+ .sorted(Comparator.comparing(AppointmentCustomerView::getAppointmentDate).reversed())
.collect(Collectors.toList());
+
+ dto.setAppointments(appointmentCustomerViewMapper.toAppointmentCustomerViewDTO(appointments));
+
+ if (!appointments.isEmpty()) {
+ AppointmentCustomerView latestAppointment = appointments.get(0);
+ dto.setContactStatus(latestAppointment.getCommunicateStatus());
+ dto.setLatestAppointmentId(latestAppointment.getId());
+ dto.setLatestAppointmentDate(latestAppointment.getAppointmentDate());
+ dto.setUpdateTime(latestAppointment.getLastModifiedDate());
+
+ setLatestAppointmentScore(dto, latestAppointment);
+ }
+ }
+
+ private void setLatestAppointmentScore(CustomerFavoriteConsultantDTO dto, AppointmentCustomerView latestAppointment) {
+ Optional<Satisfaction> satisfactionOptional = satisfactionService.getByAppointmentId(latestAppointment.getId());
+ if(satisfactionOptional.isPresent()) {
+ Satisfaction satisfaction = satisfactionOptional.get();
+ dto.setLatestAppointmentScore(satisfaction.getScore());
+ }
+ else {
+ dto.setLatestAppointmentScore(null);
+ }
}
public List<ConsultantDTO> getRecommendConsultantList() {
@@ -73,9 +112,10 @@
}
public List<ConsultantDTO> strictQueryConsultant(StrictQueryConsultantParam param) {
-
-
- return Collections.emptyList();
+ return consultantRepository.findAll(ConsultantQuerySpec.getStrictQuerySpec(param))
+ .stream()
+ .map(consultantMapper::toDto)
+ .collect(Collectors.toList());
}
public List<ConsultantDTO> fastQueryConsultant(FastQueryConsultantParam param) {
@@ -86,29 +126,33 @@
}
public ConsultantDetailDTO getConsultantDetail(String agentNo) {
- Consultant consultant = consultantRepository.findFirstByAgentNo(agentNo).orElseThrow(ConsultantNotFoundException::new);
- return consultantMapper.toDetailDto(consultant);
+ Consultant consultant = consultantRepository.findOneByAgentNo(agentNo).orElseThrow(ConsultantNotFoundException::new);
+ ConsultantDetailDTO consultantDetailDTO = consultantMapper.toDetailDto(consultant);
+
+ loginRecordService.findLatestLoginRecord(agentNo, LoginResult.SUCCESS)
+ .ifPresent(loginRecord -> consultantDetailDTO.setLatestLoginTime(loginRecord.getLoginDate()));
+
+ return consultantDetailDTO;
}
@Transactional
public void addConsultantToCustomList(AddConsultantParam param) {
List<String> agentNoList = param.getAgentNoList();
List<Consultant> consultants = consultantRepository.findAllByAgentNoIn(agentNoList);
- User user = userService.getUserWithAuthorities().orElseThrow(NotLoginException::new);
+ Long userId = SecurityUtils.getCustomerDBId();
consultants.forEach(consultant -> {
- boolean isConsultantInList = customFavoriteConsultantRepository.findOneByCustomIdAndConsultant(user.getId(), consultant).isPresent();
+ boolean isConsultantInList = customerFavoriteConsultantRepository.findOneByCustomerIdAndConsultant(userId, consultant).isPresent();
if(!isConsultantInList) {
- CustomFavoriteConsultant customFavoriteConsultant = new CustomFavoriteConsultant();
- customFavoriteConsultant.setConsultant(consultant);
- customFavoriteConsultant.setCustomId(user.getId());
- customFavoriteConsultant.setContactStatus(ContactStatusEnum.PICKED);
+ CustomerFavoriteConsultant customerFavoriteConsultant = new CustomerFavoriteConsultant();
+ customerFavoriteConsultant.setConsultant(consultant);
+ customerFavoriteConsultant.setCustomerId(userId);
- customFavoriteConsultantRepository.save(customFavoriteConsultant);
+ customerFavoriteConsultantRepository.save(customerFavoriteConsultant);
}
else {
- log.info("The consultant is in custom favorite list!");
+ log.info("The consultant is in customer favorite list! customId = {}, consultant AgentNo = {}", userId, consultant.getAgentNo());
}
});
@@ -116,7 +160,24 @@
public List<AppointmentCustomerViewDTO> getMyAppointment() {
String agentNo = SecurityUtils.getAgentNo();
- List<AppointmentCustomerView> appointmentList = appointmentCustomerViewRepository.findByAgentNo(agentNo);
- return appointmentCustomerViewMapper.toAppointmentCustomerViewDTO(appointmentList);
+ return appointmentService.getConsultantAppointments(agentNo);
}
+
+ public void removeConsultantFromCustomList(String agentNo) {
+ Long customId = SecurityUtils.getCustomerDBId();
+ Consultant consultant = consultantRepository.findOneByAgentNo(agentNo).orElseThrow(ConsultantNotFoundException::new);
+ CustomerFavoriteConsultant target = customerFavoriteConsultantRepository.findOneByCustomerIdAndConsultant(customId, consultant).orElse(null);
+
+ if(target != null) {
+ customerFavoriteConsultantRepository.delete(target);
+ }
+ else {
+ log.info("this consultant is not in customer list! agentNo = {}, customId = {}", agentNo, customId);
+ }
+ }
+
+ public void recordAllAppointmentsView() {
+ String agentNo = SecurityUtils.getAgentNo();
+ appointmentService.recordAllAppointmentsView(agentNo);
+ }
}
--
Gitblit v1.8.0