From f4ff5a6a7156417f23302ca86896a85d2937ce6a Mon Sep 17 00:00:00 2001
From: 劉鈞霖 <benson@gmail.com>
Date: 星期一, 15 十一月 2021 18:29:52 +0800
Subject: [PATCH] Merge branch 'master' of ssh://dev.pollex.com.tw:29418/pcalife/PAM
---
pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java | 102 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 89 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 07cd771..e36e0cf 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,125 @@
package com.pollex.pam.service;
+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.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.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) {
+ final ConsultantRepository consultantRepository;
+ final CustomerFavoriteConsultantRepository customerFavoriteConsultantRepository;
+ final ConsultantMapper consultantMapper;
+ final AppointmentService appointmentService;
+ final AppointmentCustomerViewRepository appointmentCustomerViewRepository;
+ final AppointmentCustomerViewMapper appointmentCustomerViewMapper;
+
+ public ConsultantService(
+ ConsultantRepository consultantRepository,
+ CustomerFavoriteConsultantRepository customerFavoriteConsultantRepository,
+ ConsultantMapper consultantMapper,
+ AppointmentService appointmentService,
+ AppointmentCustomerViewRepository appointmentCustomerViewRepository,
+ AppointmentCustomerViewMapper appointmentCustomerViewMapper
+ ) {
this.consultantRepository = consultantRepository;
+ this.customerFavoriteConsultantRepository = customerFavoriteConsultantRepository;
this.consultantMapper = consultantMapper;
+ this.appointmentService = appointmentService;
+ this.appointmentCustomerViewRepository = appointmentCustomerViewRepository;
+ this.appointmentCustomerViewMapper = appointmentCustomerViewMapper;
}
public List<ConsultantDTO> getMyConsultantList() {
- return Collections.emptyList();
+ Long userId = SecurityUtils.getCustomerId();
+ 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);
}
+
+ @Transactional
+ public void addConsultantToCustomList(AddConsultantParam param) {
+ List<String> agentNoList = param.getAgentNoList();
+ List<Consultant> consultants = consultantRepository.findAllByAgentNoIn(agentNoList);
+ Long userId = SecurityUtils.getCustomerId();
+
+ 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.getCustomerId();
+ Consultant consultant = consultantRepository.findFirstByAgentNo(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);
+ }
+ }
}
--
Gitblit v1.8.0