From 98ac8d14098015971b774362c98e3b78c073e701 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期二, 09 十一月 2021 16:37:43 +0800
Subject: [PATCH] [update] #todo 129741 嚴選配對API
---
pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 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..68dcb21 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java
@@ -10,6 +10,8 @@
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.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -19,6 +21,8 @@
@Service
public class ConsultantService {
+
+ private static final Logger log = LoggerFactory.getLogger(ConsultantService.class);
private final ConsultantRepository consultantRepository;
private final CustomFavoriteConsultantRepository customFavoriteConsultantRepository;
@@ -53,9 +57,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) {
@@ -77,12 +82,19 @@
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! customId = {}, consultant AgentNo = {}", user.getId(), consultant.getAgentNo());
+ }
});
}
--
Gitblit v1.8.0