From 5506b4a7950ac5cb59e3d966ddda18b17bd39373 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期一, 15 十一月 2021 11:40:01 +0800
Subject: [PATCH] [update] 我的顧問清單新增最後預約單id
---
pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java | 63 ++++++++++++++++---------------
1 files changed, 33 insertions(+), 30 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 d26676d..ef88b61 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java
@@ -1,28 +1,21 @@
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;
@@ -31,35 +24,33 @@
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
- AppointmentService appointmentService;
-
- @Autowired
- AppointmentCustomerViewRepository appointmentCustomerViewRepository;
-
- @Autowired
- AppointmentCustomerViewMapper appointmentCustomerViewMapper;
-
+ final ConsultantRepository consultantRepository;
+ final CustomFavoriteConsultantRepository customFavoriteConsultantRepository;
+ final ConsultantMapper consultantMapper;
+ final AppointmentService appointmentService;
+ final AppointmentCustomerViewRepository appointmentCustomerViewRepository;
+ final AppointmentCustomerViewMapper appointmentCustomerViewMapper;
+
public ConsultantService(
ConsultantRepository consultantRepository,
CustomFavoriteConsultantRepository customFavoriteConsultantRepository,
ConsultantMapper consultantMapper,
- UserService userService
+ UserService userService,
+ AppointmentService appointmentService,
+ AppointmentCustomerViewRepository appointmentCustomerViewRepository,
+ AppointmentCustomerViewMapper appointmentCustomerViewMapper
) {
this.consultantRepository = consultantRepository;
this.customFavoriteConsultantRepository = customFavoriteConsultantRepository;
this.consultantMapper = consultantMapper;
- this.userService = userService;
+ this.appointmentService = appointmentService;
+ this.appointmentCustomerViewRepository = appointmentCustomerViewRepository;
+ this.appointmentCustomerViewMapper = appointmentCustomerViewMapper;
}
public List<ConsultantDTO> getMyConsultantList() {
- User user = userService.getUserWithAuthorities().orElseThrow(NotLoginException::new);
- return customFavoriteConsultantRepository.findAllByCustomId(user.getId())
+ Long userId = SecurityUtils.getCustomerId();
+ return customFavoriteConsultantRepository.findAllByCustomerId(userId)
.stream()
.map(consultantMapper::toDto)
.collect(Collectors.toList());
@@ -95,21 +86,20 @@
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 = customFavoriteConsultantRepository.findOneByCustomerIdAndConsultant(userId, consultant).isPresent();
if(!isConsultantInList) {
CustomFavoriteConsultant customFavoriteConsultant = new CustomFavoriteConsultant();
customFavoriteConsultant.setConsultant(consultant);
- customFavoriteConsultant.setCustomId(user.getId());
- customFavoriteConsultant.setContactStatus(ContactStatusEnum.PICKED);
+ customFavoriteConsultant.setCustomerId(userId);
customFavoriteConsultantRepository.save(customFavoriteConsultant);
}
else {
- log.info("The consultant is in custom favorite list! customId = {}, consultant AgentNo = {}", user.getId(), consultant.getAgentNo());
+ log.info("The consultant is in customer favorite list! customId = {}, consultant AgentNo = {}", userId, consultant.getAgentNo());
}
});
@@ -120,4 +110,17 @@
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);
+ CustomFavoriteConsultant target = customFavoriteConsultantRepository.findOneByCustomerIdAndConsultant(customId, consultant).orElse(null);
+
+ if(target != null) {
+ customFavoriteConsultantRepository.delete(target);
+ }
+ else {
+ log.info("this consultant is not in customer list! agentNo = {}, customId = {}", agentNo, customId);
+ }
+ }
}
--
Gitblit v1.8.0