From 6fa4bba623713c396432ba8b863846883d6a1906 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期三, 26 一月 2022 10:52:23 +0800
Subject: [PATCH] Merge branch 'pollex-dev' into sit
---
pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java | 227 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 214 insertions(+), 13 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 3dbcbd9..0179b54 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java
@@ -1,26 +1,48 @@
package com.pollex.pam.service;
+import com.pollex.pam.config.ApplicationProperties;
+import com.pollex.pam.domain.Appointment;
import com.pollex.pam.domain.AppointmentCustomerView;
import com.pollex.pam.domain.Consultant;
import com.pollex.pam.domain.CustomerFavoriteConsultant;
-import com.pollex.pam.repository.AppointmentCustomerViewRepository;
+import com.pollex.pam.domain.Satisfaction;
+import com.pollex.pam.enums.ContactStatusEnum;
+import com.pollex.pam.enums.LoginResult;
import com.pollex.pam.repository.ConsultantRepository;
import com.pollex.pam.repository.CustomerFavoriteConsultantRepository;
+import com.pollex.pam.repository.SatisfactionRepository;
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;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
+import org.thymeleaf.context.Context;
+import org.thymeleaf.spring5.SpringTemplateEngine;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.math.BigDecimal;
+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
+@Transactional
public class ConsultantService {
private static final Logger log = LoggerFactory.getLogger(ConsultantService.class);
@@ -38,17 +60,93 @@
AppointmentService appointmentService;
@Autowired
- AppointmentCustomerViewRepository appointmentCustomerViewRepository;
+ LoginRecordService loginRecordService;
@Autowired
AppointmentCustomerViewMapper appointmentCustomerViewMapper;
- public List<ConsultantDTO> getMyConsultantList() {
- Long userId = SecurityUtils.getCustomerId();
- return customerFavoriteConsultantRepository.findAllByCustomerId(userId)
+ @Autowired
+ SatisfactionService satisfactionService;
+
+ @Autowired
+ ConsultantDTOMapper consultantDTOMapper;
+
+ @Autowired
+ ApplicationProperties applicationProperty;
+
+ @Autowired
+ SendMsgService sendMsgService;
+
+ @Autowired
+ SpringTemplateEngine springTemplateEngine;
+
+ @Autowired
+ ApplicationProperties applicationProperties;
+
+ @Autowired
+ ConsultantService consultantService;
+
+ @Autowired
+ SatisfactionRepository satisfactionRepository;
+
+ @Autowired
+ PersonalNotificationService personalNotificationService;
+
+ public List<CustomerFavoriteConsultantDTO> getMyConsultantList() {
+ Long customerId = SecurityUtils.getCustomerDBId();
+
+ return customerFavoriteConsultantRepository.findAllByCustomerId(customerId)
.stream()
- .map(consultantMapper::toDto)
+ .map(relation -> {
+ Consultant consultant = relation.getConsultant();
+ CustomerFavoriteConsultantDTO dto = consultantMapper.toCustomerFavoriteConsultantDto(consultant);
+ dto.setCreateTime(relation.getCreatedDate());
+ dto.setUpdateTime(relation.getCreatedDate());
+ dto.setCustomerViewTime(relation.getViewTime());
+
+ setInfoByAvailableAppointment(
+ dto,
+ appointmentService.findAvailableByAgentNoAndCustomerId(consultant.getAgentNo(), customerId)
+ );
+
+ setFavoriteConsultantUpdatedTime(relation, dto);
+
+ return dto;
+
+ }).collect(Collectors.toList());
+ }
+
+ public void setFavoriteConsultantUpdatedTime(CustomerFavoriteConsultant relation,
+ CustomerFavoriteConsultantDTO dto) {
+ Consultant consultant = relation.getConsultant();
+ appointmentService.findLatestAppointmentByAgentNoAndCustomerId(consultant.getAgentNo(), relation.getCustomerId())
+ .ifPresent(latestAppointment -> {
+ dto.setUpdateTime(latestAppointment.getLastModifiedDate());
+ });
+
+ if(dto.getUpdateTime().isBefore(relation.getCreatedDate())) {
+ dto.setUpdateTime(relation.getCreatedDate());
+ }
+ }
+
+ private void setInfoByAvailableAppointment(CustomerFavoriteConsultantDTO customerFavoriteConsultantDTO, List<AppointmentCustomerView> appointmentList) {
+ List<AppointmentCustomerView> appointments = appointmentList.stream()
+ .sorted(Comparator.comparing(AppointmentCustomerView::getAppointmentDate).reversed())
.collect(Collectors.toList());
+
+ List<AppointmentCustomerViewDTO> appointmentCustomerViewDTOS = appointmentCustomerViewMapper.toAppointmentCustomerViewDTO(appointments);
+ customerFavoriteConsultantDTO.setAppointments(appointmentCustomerViewDTOS);
+
+ if (!appointments.isEmpty()) {
+ AppointmentCustomerView latestAvailableAppointment = appointments.get(0);
+ ContactStatusEnum latestStatus = latestAvailableAppointment.getCommunicateStatus();
+ if(latestStatus != ContactStatusEnum.DONE && latestStatus != ContactStatusEnum.CLOSED)
+ customerFavoriteConsultantDTO.setContactStatus(latestStatus);
+ else
+ customerFavoriteConsultantDTO.setContactStatus(PICKED);
+ }else {
+ customerFavoriteConsultantDTO.setContactStatus(PICKED);
+ }
}
public List<ConsultantDTO> getRecommendConsultantList() {
@@ -73,15 +171,20 @@
}
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);
- Long userId = SecurityUtils.getCustomerId();
+ Long userId = SecurityUtils.getCustomerDBId();
consultants.forEach(consultant -> {
boolean isConsultantInList = customerFavoriteConsultantRepository.findOneByCustomerIdAndConsultant(userId, consultant).isPresent();
@@ -102,13 +205,12 @@
public List<AppointmentCustomerViewDTO> getMyAppointment() {
String agentNo = SecurityUtils.getAgentNo();
- List<AppointmentCustomerView> appointmentList = appointmentCustomerViewRepository.findByAgentNo(agentNo);
- return appointmentCustomerViewMapper.toAppointmentCustomerViewDTO(appointmentList);
+ return appointmentService.getConsultantAvailableAppointments(agentNo);
}
public void removeConsultantFromCustomList(String agentNo) {
- Long customId = SecurityUtils.getCustomerId();
- Consultant consultant = consultantRepository.findFirstByAgentNo(agentNo).orElseThrow(ConsultantNotFoundException::new);
+ Long customId = SecurityUtils.getCustomerDBId();
+ Consultant consultant = consultantRepository.findOneByAgentNo(agentNo).orElseThrow(ConsultantNotFoundException::new);
CustomerFavoriteConsultant target = customerFavoriteConsultantRepository.findOneByCustomerIdAndConsultant(customId, consultant).orElse(null);
if(target != null) {
@@ -118,4 +220,103 @@
log.info("this consultant is not in customer list! agentNo = {}, customId = {}", agentNo, customId);
}
}
+
+ public void recordAllAppointmentsView() {
+ 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());
+ consultantRepository.save(consultant);
+ personalNotificationService.createEditConsultantToConsultant(consultant);
+ return 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;
+ }
+ }
+
+ public void sendSatisfactionToClient(Appointment appointment) {
+ String subject = "皛踵�漲憛怠神�";
+
+ if(StringUtils.hasText(appointment.getEmail())) {
+ String content = genSendSatisfactionEmailContent(appointment);
+ sendMsgService.sendMsgByEmail(appointment.getEmail(), subject, content, true);
+
+ }if(StringUtils.hasText(appointment.getPhone())) {
+ String content = genSendSatisfactionSMSContent(appointment);
+ sendMsgService.sendMsgBySMS(appointment.getPhone(), content);
+ }
+
+ personalNotificationService.createSendSatisfactionToClientToCustomer(appointment);
+ }
+
+ private String genSendSatisfactionSMSContent(Appointment appointment) {
+ String agentNo = appointment.getAgentNo();
+ Consultant consultant = consultantService.findByAgentNo(agentNo);
+ String contsultantName = consultant.getName();
+ String content = contsultantName+"憿批��憛怠神靽���像���遛��漲閰��"+getSendSatisfactionToClientUrl(appointment.getId());
+ return content;
+ }
+
+ private String genSendSatisfactionEmailContent(Appointment appointment) {
+ String agentNo = appointment.getAgentNo();
+ Consultant consultant = consultantService.findByAgentNo(agentNo);
+ Context context = new Context();
+ context.setVariable("consultantName", consultant.getName());
+ context.setVariable("appointmentUrl", getSendSatisfactionToClientUrl(appointment.getId()));
+ String content = springTemplateEngine.process("mail/writeSatisfactionNotice", context);
+ return content;
+ }
+
+ public String getSendSatisfactionToClientUrl(Long appointmentId) {
+ return applicationProperties.getFrontEndDomain() + "/?appointmentId=" + appointmentId;
+ }
+
+ public void setConsultantAvgScore(Satisfaction satisfaction) {
+ float avgScore = getAgentAvgScore(satisfaction.getAgentNo());
+ Consultant consultant = consultantRepository.findOneByAgentNo(satisfaction.getAgentNo())
+ .get();
+ consultant.setAvgScore(avgScore);
+ consultantRepository.save(consultant);
+ }
+
+ public float getAgentAvgScore(String agentNo) {
+ Float avgScore = satisfactionRepository.getAgentScoreAvg(agentNo);
+ if(avgScore==null)return 0;
+ BigDecimal bigDecimal = new BigDecimal(avgScore);
+ return avgScore = bigDecimal.setScale(1,BigDecimal.ROUND_HALF_UP).floatValue();
+ }
}
--
Gitblit v1.8.0