From e529777b9c74e80649fc82610eb4f2ea95b63df0 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期五, 26 十一月 2021 10:38:41 +0800
Subject: [PATCH] [update] 若顧問服務地區為全台，則任何地區條件的搜尋都可以將其列出
---
pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java | 42 +++++++++++++++++++-----------------------
1 files changed, 19 insertions(+), 23 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 e36e0cf..af9c247 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java
@@ -13,6 +13,7 @@
import com.pollex.pam.web.rest.errors.ConsultantNotFoundException;
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;
@@ -24,28 +25,23 @@
private static final Logger log = LoggerFactory.getLogger(ConsultantService.class);
- final ConsultantRepository consultantRepository;
- final CustomerFavoriteConsultantRepository customerFavoriteConsultantRepository;
- final ConsultantMapper consultantMapper;
- final AppointmentService appointmentService;
- final AppointmentCustomerViewRepository appointmentCustomerViewRepository;
- final AppointmentCustomerViewMapper appointmentCustomerViewMapper;
+ @Autowired
+ ConsultantRepository consultantRepository;
- 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;
- }
+ @Autowired
+ CustomerFavoriteConsultantRepository customerFavoriteConsultantRepository;
+
+ @Autowired
+ ConsultantMapper consultantMapper;
+
+ @Autowired
+ AppointmentService appointmentService;
+
+ @Autowired
+ AppointmentCustomerViewRepository appointmentCustomerViewRepository;
+
+ @Autowired
+ AppointmentCustomerViewMapper appointmentCustomerViewMapper;
public List<ConsultantDTO> getMyConsultantList() {
Long userId = SecurityUtils.getCustomerId();
@@ -77,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);
}
@@ -112,7 +108,7 @@
public void removeConsultantFromCustomList(String agentNo) {
Long customId = SecurityUtils.getCustomerId();
- Consultant consultant = consultantRepository.findFirstByAgentNo(agentNo).orElseThrow(ConsultantNotFoundException::new);
+ Consultant consultant = consultantRepository.findOneByAgentNo(agentNo).orElseThrow(ConsultantNotFoundException::new);
CustomerFavoriteConsultant target = customerFavoriteConsultantRepository.findOneByCustomerIdAndConsultant(customId, consultant).orElse(null);
if(target != null) {
--
Gitblit v1.8.0