From 715ebe0b3348a09d513772f2c246463f50c94ca7 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期三, 01 十二月 2021 18:02:51 +0800
Subject: [PATCH] [update]【todo 131358】otp認證錯誤detail改回傳錯誤代碼供前端轉換對應文案
---
pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java | 135 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 117 insertions(+), 18 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 07cd771..acc8f33 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java
@@ -1,49 +1,148 @@
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.CustomerFavoriteConsultant;
+import com.pollex.pam.enums.LoginResult;
+import com.pollex.pam.repository.AppointmentCustomerViewRepository;
+import com.pollex.pam.repository.AppointmentRepository;
import com.pollex.pam.repository.ConsultantRepository;
+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.ConsultantMapper;
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 java.util.Collections;
+import java.time.Instant;
import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
@Service
public class ConsultantService {
- private final ConsultantRepository consultantRepository;
- private final ConsultantMapper consultantMapper;
+ private static final Logger log = LoggerFactory.getLogger(ConsultantService.class);
- public ConsultantService(ConsultantRepository consultantRepository, ConsultantMapper consultantMapper) {
- this.consultantRepository = consultantRepository;
- this.consultantMapper = consultantMapper;
- }
+ @Autowired
+ ConsultantRepository consultantRepository;
+
+ @Autowired
+ CustomerFavoriteConsultantRepository customerFavoriteConsultantRepository;
+
+ @Autowired
+ ConsultantMapper consultantMapper;
+
+ @Autowired
+ AppointmentService appointmentService;
+
+ @Autowired
+ AppointmentRepository appointmentRepository;
+
+ @Autowired
+ AppointmentCustomerViewRepository appointmentCustomerViewRepository;
+
+ @Autowired
+ AppointmentCustomerViewMapper appointmentCustomerViewMapper;
+
+ @Autowired
+ LoginRecordService loginRecordService;
public List<ConsultantDTO> getMyConsultantList() {
- return Collections.emptyList();
+ Long userId = SecurityUtils.getCustomerDBId();
+ return customerFavoriteConsultantRepository.findAllByCustomerId(userId)
+ .stream()
+ .map(consultantMapper::toDto)
+ .collect(Collectors.toList());
}
public List<ConsultantDTO> getRecommendConsultantList() {
- List<Consultant> recommendConsultantList = consultantRepository.findAllByRecommendIsTrue();
- return consultantMapper.toDto(recommendConsultantList);
- }
-
- public void addConsultantToOwnList(AddConsultantParam param) {
- List<String> agentNoList = param.getAgentNoList();
+ return consultantRepository.findAllByRecommendIsTrue()
+ .stream()
+ .map(consultantMapper::toDto)
+ .collect(Collectors.toList());
}
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) {
- return Collections.emptyList();
+ return consultantRepository.findAll(ConsultantQuerySpec.getFastQuerySpec(param))
+ .stream()
+ .map(consultantMapper::toDto)
+ .collect(Collectors.toList());
}
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.getCustomerDBId();
+
+ consultants.forEach(consultant -> {
+ boolean isConsultantInList = customerFavoriteConsultantRepository.findOneByCustomerIdAndConsultant(userId, consultant).isPresent();
+
+ if(!isConsultantInList) {
+ CustomerFavoriteConsultant customerFavoriteConsultant = new CustomerFavoriteConsultant();
+ customerFavoriteConsultant.setConsultant(consultant);
+ customerFavoriteConsultant.setCustomerId(userId);
+
+ customerFavoriteConsultantRepository.save(customerFavoriteConsultant);
+ }
+ else {
+ log.info("The consultant is in customer favorite list! customId = {}, consultant AgentNo = {}", userId, consultant.getAgentNo());
+ }
+ });
+
+ }
+
+ public List<AppointmentCustomerViewDTO> getMyAppointment() {
+ String agentNo = SecurityUtils.getAgentNo();
+ List<AppointmentCustomerView> appointmentList = appointmentCustomerViewRepository.findByAgentNo(agentNo);
+ return appointmentCustomerViewMapper.toAppointmentCustomerViewDTO(appointmentList);
+ }
+
+ 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();
+ List<Appointment> consultantNotViewAppointments = appointmentService.findByAgentNo(agentNo)
+ .stream()
+ .filter(appointment -> Objects.isNull(appointment.getConsultantViewTime()))
+ .collect(Collectors.toList());
+
+ consultantNotViewAppointments.forEach(appointment -> appointment.setConsultantViewTime(Instant.now()));
+ appointmentRepository.saveAll(consultantNotViewAppointments);
}
}
--
Gitblit v1.8.0