From aa5b8b8266912d4b02d432049a66d29f56245115 Mon Sep 17 00:00:00 2001
From: Jack <jack.su@pollex.com.tw>
Date: 星期五, 26 十一月 2021 18:33:23 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.0.10:29418/pcalife/PAM
---
pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java | 93 ++++++++++++++++++++++++++++------------------
1 files changed, 57 insertions(+), 36 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 b9fbf53..af9c247 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,51 @@
package com.pollex.pam.service;
+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.domain.CustomerFavoriteConsultant;
+import com.pollex.pam.repository.AppointmentCustomerViewRepository;
import com.pollex.pam.repository.ConsultantRepository;
-import com.pollex.pam.repository.CustomFavoriteConsultantRepository;
+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 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 static Logger log = LoggerFactory.getLogger(ConsultantService.class);
+ private static final Logger log = LoggerFactory.getLogger(ConsultantService.class);
- private final ConsultantRepository consultantRepository;
- private final CustomFavoriteConsultantRepository customFavoriteConsultantRepository;
- private final ConsultantMapper consultantMapper;
- private final UserService userService;
+ @Autowired
+ ConsultantRepository consultantRepository;
- public ConsultantService(
- ConsultantRepository consultantRepository,
- CustomFavoriteConsultantRepository customFavoriteConsultantRepository,
- ConsultantMapper consultantMapper,
- UserService userService
- ) {
- this.consultantRepository = consultantRepository;
- this.customFavoriteConsultantRepository = customFavoriteConsultantRepository;
- this.consultantMapper = consultantMapper;
- this.userService = userService;
- }
+ @Autowired
+ CustomerFavoriteConsultantRepository customerFavoriteConsultantRepository;
+
+ @Autowired
+ ConsultantMapper consultantMapper;
+
+ @Autowired
+ AppointmentService appointmentService;
+
+ @Autowired
+ AppointmentCustomerViewRepository appointmentCustomerViewRepository;
+
+ @Autowired
+ AppointmentCustomerViewMapper appointmentCustomerViewMapper;
public List<ConsultantDTO> getMyConsultantList() {
- User user = userService.getUserWithAuthorities().orElseThrow(NotLoginException::new);
- return customFavoriteConsultantRepository.findAllByCustomId(user.getId())
+ Long userId = SecurityUtils.getCustomerId();
+ return customerFavoriteConsultantRepository.findAllByCustomerId(userId)
.stream()
.map(consultantMapper::toDto)
.collect(Collectors.toList());
@@ -57,9 +59,10 @@
}
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) {
@@ -70,7 +73,7 @@
}
public ConsultantDetailDTO getConsultantDetail(String agentNo) {
- Consultant consultant = consultantRepository.findFirstByAgentNo(agentNo).orElseThrow(ConsultantNotFoundException::new);
+ Consultant consultant = consultantRepository.findOneByAgentNo(agentNo).orElseThrow(ConsultantNotFoundException::new);
return consultantMapper.toDetailDto(consultant);
}
@@ -78,23 +81,41 @@
public void addConsultantToCustomList(AddConsultantParam param) {
List<String> agentNoList = param.getAgentNoList();
List<Consultant> consultants = consultantRepository.findAllByAgentNoIn(agentNoList);
- User user = userService.getUserWithAuthorities().orElseThrow(NotLoginException::new);
+ Long userId = SecurityUtils.getCustomerId();
consultants.forEach(consultant -> {
- boolean isConsultantInList = customFavoriteConsultantRepository.findOneByCustomIdAndConsultant(user.getId(), consultant).isPresent();
+ boolean isConsultantInList = customerFavoriteConsultantRepository.findOneByCustomerIdAndConsultant(userId, consultant).isPresent();
if(!isConsultantInList) {
- CustomFavoriteConsultant customFavoriteConsultant = new CustomFavoriteConsultant();
- customFavoriteConsultant.setConsultant(consultant);
- customFavoriteConsultant.setCustomId(user.getId());
- customFavoriteConsultant.setContactStatus(ContactStatusEnum.PICKED);
+ CustomerFavoriteConsultant customerFavoriteConsultant = new CustomerFavoriteConsultant();
+ customerFavoriteConsultant.setConsultant(consultant);
+ customerFavoriteConsultant.setCustomerId(userId);
- customFavoriteConsultantRepository.save(customFavoriteConsultant);
+ customerFavoriteConsultantRepository.save(customerFavoriteConsultant);
}
else {
- log.info("The consultant is in custom favorite list!");
+ 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.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);
+ }
+ }
}
--
Gitblit v1.8.0