From 61a592ba01d2ddb29b5c75df83ed0ffae288bf46 Mon Sep 17 00:00:00 2001
From: Jack <jack.su@pollex.com.tw>
Date: 星期三, 10 十一月 2021 15:14:05 +0800
Subject: [PATCH] [ADD] 預約前詢問API [ADD] 顧問登入取得所屬全部的預約單API
---
pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java | 45 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 39 insertions(+), 6 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 e71667b..96a6383 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java
@@ -1,15 +1,24 @@
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;
@@ -20,11 +29,22 @@
@Service
public class ConsultantService {
+ private final static 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;
+
public ConsultantService(
ConsultantRepository consultantRepository,
CustomFavoriteConsultantRepository customFavoriteConsultantRepository,
@@ -77,13 +97,26 @@
User user = userService.getUserWithAuthorities().orElseThrow(NotLoginException::new);
consultants.forEach(consultant -> {
- CustomFavoriteConsultant customFavoriteConsultant = new CustomFavoriteConsultant();
- customFavoriteConsultant.setConsultant(consultant);
- customFavoriteConsultant.setCustomId(user.getId());
- customFavoriteConsultant.setContactStatus(ContactStatusEnum.PICKED);
+ boolean isConsultantInList = customFavoriteConsultantRepository.findOneByCustomIdAndConsultant(user.getId(), consultant).isPresent();
- customFavoriteConsultantRepository.save(customFavoriteConsultant);
+ if(!isConsultantInList) {
+ CustomFavoriteConsultant customFavoriteConsultant = new CustomFavoriteConsultant();
+ customFavoriteConsultant.setConsultant(consultant);
+ customFavoriteConsultant.setCustomId(user.getId());
+ customFavoriteConsultant.setContactStatus(ContactStatusEnum.PICKED);
+
+ customFavoriteConsultantRepository.save(customFavoriteConsultant);
+ }
+ else {
+ log.info("The consultant is in custom favorite list!");
+ }
});
}
+
+ public List<AppointmentCustomerViewDTO> getMyAppointment() {
+ String agentNo = SecurityUtils.getAgentNo();
+ List<AppointmentCustomerView> appointmentList = appointmentCustomerViewRepository.findByAgentNo(agentNo);
+ return appointmentCustomerViewMapper.toAppointmentCustomerViewDTO(appointmentList);
+ }
}
--
Gitblit v1.8.0