From a474351e790a0bfeaa747b01eb92282ca05e5a36 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期一, 15 十一月 2021 16:43:30 +0800
Subject: [PATCH] [ref] 調整錯字
---
pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 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 ef88b61..e36e0cf 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java
@@ -2,10 +2,10 @@
import com.pollex.pam.domain.AppointmentCustomerView;
import com.pollex.pam.domain.Consultant;
-import com.pollex.pam.domain.CustomFavoriteConsultant;
+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;
@@ -25,7 +25,7 @@
private static final Logger log = LoggerFactory.getLogger(ConsultantService.class);
final ConsultantRepository consultantRepository;
- final CustomFavoriteConsultantRepository customFavoriteConsultantRepository;
+ final CustomerFavoriteConsultantRepository customerFavoriteConsultantRepository;
final ConsultantMapper consultantMapper;
final AppointmentService appointmentService;
final AppointmentCustomerViewRepository appointmentCustomerViewRepository;
@@ -33,15 +33,14 @@
public ConsultantService(
ConsultantRepository consultantRepository,
- CustomFavoriteConsultantRepository customFavoriteConsultantRepository,
+ CustomerFavoriteConsultantRepository customerFavoriteConsultantRepository,
ConsultantMapper consultantMapper,
- UserService userService,
AppointmentService appointmentService,
AppointmentCustomerViewRepository appointmentCustomerViewRepository,
AppointmentCustomerViewMapper appointmentCustomerViewMapper
) {
this.consultantRepository = consultantRepository;
- this.customFavoriteConsultantRepository = customFavoriteConsultantRepository;
+ this.customerFavoriteConsultantRepository = customerFavoriteConsultantRepository;
this.consultantMapper = consultantMapper;
this.appointmentService = appointmentService;
this.appointmentCustomerViewRepository = appointmentCustomerViewRepository;
@@ -50,7 +49,7 @@
public List<ConsultantDTO> getMyConsultantList() {
Long userId = SecurityUtils.getCustomerId();
- return customFavoriteConsultantRepository.findAllByCustomerId(userId)
+ return customerFavoriteConsultantRepository.findAllByCustomerId(userId)
.stream()
.map(consultantMapper::toDto)
.collect(Collectors.toList());
@@ -89,14 +88,14 @@
Long userId = SecurityUtils.getCustomerId();
consultants.forEach(consultant -> {
- boolean isConsultantInList = customFavoriteConsultantRepository.findOneByCustomerIdAndConsultant(userId, consultant).isPresent();
+ boolean isConsultantInList = customerFavoriteConsultantRepository.findOneByCustomerIdAndConsultant(userId, consultant).isPresent();
if(!isConsultantInList) {
- CustomFavoriteConsultant customFavoriteConsultant = new CustomFavoriteConsultant();
- customFavoriteConsultant.setConsultant(consultant);
- customFavoriteConsultant.setCustomerId(userId);
+ CustomerFavoriteConsultant customerFavoriteConsultant = new CustomerFavoriteConsultant();
+ customerFavoriteConsultant.setConsultant(consultant);
+ customerFavoriteConsultant.setCustomerId(userId);
- customFavoriteConsultantRepository.save(customFavoriteConsultant);
+ customerFavoriteConsultantRepository.save(customerFavoriteConsultant);
}
else {
log.info("The consultant is in customer favorite list! customId = {}, consultant AgentNo = {}", userId, consultant.getAgentNo());
@@ -114,10 +113,10 @@
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);
+ CustomerFavoriteConsultant target = customerFavoriteConsultantRepository.findOneByCustomerIdAndConsultant(customId, consultant).orElse(null);
if(target != null) {
- customFavoriteConsultantRepository.delete(target);
+ customerFavoriteConsultantRepository.delete(target);
}
else {
log.info("this consultant is not in customer list! agentNo = {}, customId = {}", agentNo, customId);
--
Gitblit v1.8.0