From c5a873f70239f30158c6ab67b3e55de71413de9a Mon Sep 17 00:00:00 2001
From: Mila <Mila@pollex.com.tw>
Date: 星期三, 10 十一月 2021 18:05:47 +0800
Subject: [PATCH] Merge branch 'master' of https://192.168.0.10:8443/r/pcalife/PAM
---
pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java | 98 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 86 insertions(+), 12 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..d26676d 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,123 @@
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.enums.ContactStatusEnum;
+import com.pollex.pam.repository.AppointmentCustomerViewRepository;
import com.pollex.pam.repository.ConsultantRepository;
+import com.pollex.pam.repository.CustomFavoriteConsultantRepository;
+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.List;
+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) {
+ private final ConsultantRepository consultantRepository;
+ private final CustomFavoriteConsultantRepository customFavoriteConsultantRepository;
+ private final ConsultantMapper consultantMapper;
+ private final UserService userService;
+
+ @Autowired
+ AppointmentService appointmentService;
+
+ @Autowired
+ AppointmentCustomerViewRepository appointmentCustomerViewRepository;
+
+ @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;
}
public List<ConsultantDTO> getMyConsultantList() {
- return Collections.emptyList();
+ User user = userService.getUserWithAuthorities().orElseThrow(NotLoginException::new);
+ return customFavoriteConsultantRepository.findAllByCustomId(user.getId())
+ .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);
}
+
+ @Transactional
+ public void addConsultantToCustomList(AddConsultantParam param) {
+ List<String> agentNoList = param.getAgentNoList();
+ List<Consultant> consultants = consultantRepository.findAllByAgentNoIn(agentNoList);
+ User user = userService.getUserWithAuthorities().orElseThrow(NotLoginException::new);
+
+ consultants.forEach(consultant -> {
+ boolean isConsultantInList = customFavoriteConsultantRepository.findOneByCustomIdAndConsultant(user.getId(), consultant).isPresent();
+
+ if(!isConsultantInList) {
+ CustomFavoriteConsultant customFavoriteConsultant = new CustomFavoriteConsultant();
+ customFavoriteConsultant.setConsultant(consultant);
+ customFavoriteConsultant.setCustomId(user.getId());
+ customFavoriteConsultant.setContactStatus(ContactStatusEnum.PICKED);
+
+ customFavoriteConsultantRepository.save(customFavoriteConsultant);
+ }
+ else {
+ log.info("The consultant is in custom favorite list! customId = {}, consultant AgentNo = {}", user.getId(), consultant.getAgentNo());
+ }
+ });
+
+ }
+
+ public List<AppointmentCustomerViewDTO> getMyAppointment() {
+ String agentNo = SecurityUtils.getAgentNo();
+ List<AppointmentCustomerView> appointmentList = appointmentCustomerViewRepository.findByAgentNo(agentNo);
+ return appointmentCustomerViewMapper.toAppointmentCustomerViewDTO(appointmentList);
+ }
}
--
Gitblit v1.8.0