From 98471b0ef1a5751c8acea4354c93c63a1e95d42c Mon Sep 17 00:00:00 2001
From: Jack <jack.su@pollex.com.tw>
Date: 星期五, 14 一月 2022 17:43:41 +0800
Subject: [PATCH] [ADD] 查詢顧問詳細資料新增email欄位
---
pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java | 88 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 80 insertions(+), 8 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 adbb6ab..32d8e51 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java
@@ -1,5 +1,6 @@
package com.pollex.pam.service;
+import com.pollex.pam.config.ApplicationProperties;
import com.pollex.pam.domain.AppointmentCustomerView;
import com.pollex.pam.domain.Consultant;
import com.pollex.pam.domain.CustomerFavoriteConsultant;
@@ -10,7 +11,9 @@
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.ConsultantDTOMapper;
import com.pollex.pam.service.mapper.ConsultantMapper;
+import com.pollex.pam.service.util.FileUtil;
import com.pollex.pam.web.rest.errors.ConsultantNotFoundException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -18,9 +21,18 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.time.Instant;
import java.util.Comparator;
import java.util.List;
+import java.util.Objects;
import java.util.stream.Collectors;
+
+import static com.pollex.pam.enums.ContactStatusEnum.*;
@Service
public class ConsultantService {
@@ -48,29 +60,46 @@
@Autowired
SatisfactionService satisfactionService;
+ @Autowired
+ ConsultantDTOMapper consultantDTOMapper;
+
+ @Autowired
+ ApplicationProperties applicationProperty;
+
public List<CustomerFavoriteConsultantDTO> getMyConsultantList() {
Long customerId = SecurityUtils.getCustomerDBId();
return customerFavoriteConsultantRepository.findAllByCustomerId(customerId)
.stream()
- .map(customerFavoriteConsultantRelation -> {
- Consultant consultant = customerFavoriteConsultantRelation.getConsultant();
+ .map(relation -> {
+ Consultant consultant = relation.getConsultant();
CustomerFavoriteConsultantDTO dto = consultantMapper.toCustomerFavoriteConsultantDto(consultant);
dto.setContactStatus(ContactStatusEnum.PICKED);
- dto.setCreateTime(customerFavoriteConsultantRelation.getCreatedDate());
+ dto.setCreateTime(relation.getCreatedDate());
+ dto.setUpdateTime(relation.getCreatedDate());
+ dto.setCustomerViewTime(relation.getViewTime());
- setAppointmentInfo(
+ setAvailableAppointmentInfo(
dto,
appointmentService.findAvailableByAgentNoAndCustomerId(consultant.getAgentNo(), customerId)
);
+
+ appointmentService.findLatestAppointmentByAgentNoAndCustomerId(consultant.getAgentNo(), customerId)
+ .ifPresent(latestAppointment -> {
+ dto.setUpdateTime(latestAppointment.getLastModifiedDate());
+ });
+
+ if(dto.getUpdateTime().isBefore(relation.getCreatedDate())) {
+ dto.setUpdateTime(relation.getCreatedDate());
+ }
return dto;
}).collect(Collectors.toList());
}
- private void setAppointmentInfo(CustomerFavoriteConsultantDTO customerFavoriteConsultantDTO, List<AppointmentCustomerView> appointmentList) {
+ private void setAvailableAppointmentInfo(CustomerFavoriteConsultantDTO customerFavoriteConsultantDTO, List<AppointmentCustomerView> appointmentList) {
List<AppointmentCustomerView> appointments = appointmentList.stream()
.sorted(Comparator.comparing(AppointmentCustomerView::getAppointmentDate).reversed())
.collect(Collectors.toList());
@@ -82,9 +111,12 @@
customerFavoriteConsultantDTO.setAppointments(appointmentCustomerViewDTOS);
if (!appointments.isEmpty()) {
- AppointmentCustomerView latestAppointment = appointments.get(0);
- customerFavoriteConsultantDTO.setContactStatus(latestAppointment.getCommunicateStatus());
- customerFavoriteConsultantDTO.setUpdateTime(latestAppointment.getLastModifiedDate());
+ AppointmentCustomerView latestAvailableAppointment = appointments.get(0);
+
+ if(latestAvailableAppointment.getCommunicateStatus() == RESERVED)
+ customerFavoriteConsultantDTO.setContactStatus(RESERVED);
+ else
+ customerFavoriteConsultantDTO.setContactStatus(PICKED);
}
}
@@ -164,4 +196,44 @@
String agentNo = SecurityUtils.getAgentNo();
appointmentService.recordAllAppointmentsView(agentNo);
}
+
+ public void recordMyConsultantListView() {
+ Long customerId = SecurityUtils.getCustomerDBId();
+ List<CustomerFavoriteConsultant> notViewRelation = customerFavoriteConsultantRepository
+ .findAllByCustomerId(customerId)
+ .stream()
+ .filter(relation -> Objects.isNull(relation.getViewTime()))
+ .collect(Collectors.toList());
+
+ notViewRelation.forEach(relation -> {
+ relation.setViewTime(Instant.now());
+ });
+
+ customerFavoriteConsultantRepository.saveAll(notViewRelation);
+ }
+
+ public Consultant findByAgentNo(String agentNo) {
+ return consultantRepository.findOneByAgentNo(agentNo).get();
+ }
+
+ public Consultant editConsultant(ConsultantEditDTO editDTO) {
+ Consultant consultant = consultantRepository.findOneByAgentNo(editDTO.getAgentNo())
+ .orElseThrow(ConsultantNotFoundException::new);
+ consultantDTOMapper.copyToConsultant(editDTO, consultant);
+ FileUtil.base64ToFile(editDTO.getPhotoBase64(), editDTO.getPhotoFileName(), applicationProperty.getFileFolderPath());
+ return consultantRepository.save(consultant);
+ }
+
+ public InputStream getAvatarImage(String agentNo) {
+ Consultant consultant = consultantRepository.findOneByAgentNo(agentNo)
+ .orElseThrow(ConsultantNotFoundException::new);
+ File file = new File(consultant.getPhotoPath());
+ try {
+ InputStream in = new FileInputStream(file);
+ return in;
+ } catch (FileNotFoundException e) {
+ log.error("agent photo not found , agentNo:"+agentNo,e);
+ return null;
+ }
+ }
}
--
Gitblit v1.8.0