From de5237577689d6294a82e8541768f00f11a2b2cb Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期三, 29 十二月 2021 13:53:07 +0800
Subject: [PATCH] [fix] 微調錯誤機制的攔截邏輯

---
 pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 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 72a1e29..5f8232c 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java
@@ -24,6 +24,8 @@
 import java.util.Objects;
 import java.util.stream.Collectors;
 
+import static com.pollex.pam.enums.ContactStatusEnum.*;
+
 @Service
 public class ConsultantService {
 
@@ -96,7 +98,11 @@
 
         if (!appointments.isEmpty()) {
             AppointmentCustomerView latestAvailableAppointment = appointments.get(0);
-            customerFavoriteConsultantDTO.setContactStatus(latestAvailableAppointment.getCommunicateStatus());
+
+            if(latestAvailableAppointment.getCommunicateStatus() == RESERVED)
+                customerFavoriteConsultantDTO.setContactStatus(RESERVED);
+            else
+                customerFavoriteConsultantDTO.setContactStatus(PICKED);
         }
     }
 
@@ -191,4 +197,8 @@
 
         customerFavoriteConsultantRepository.saveAll(notViewRelation);
     }
+
+    public Consultant findByAgentNo(String agentNo) {
+        return consultantRepository.findOneByAgentNo(agentNo).get();
+    }
 }

--
Gitblit v1.8.0