From cefc2c5ad32eddb94998f8ffc759f1fd8806e56e Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期四, 10 二月 2022 12:33:31 +0800
Subject: [PATCH] [update] 因應需求並不會有全台選項，因此移除其資料，並將嚴選配對的搜尋修正

---
 pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java |   55 ++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java b/pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java
index a2f280e..fe72710 100644
--- a/pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java
+++ b/pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java
@@ -2,23 +2,21 @@
 
 import com.pollex.pam.appointment.process.AppointmentProcess;
 import com.pollex.pam.domain.Appointment;
-import com.pollex.pam.enums.ContactStatusEnum;
+import com.pollex.pam.security.SecurityUtils;
 import com.pollex.pam.service.SendMsgService;
-import com.pollex.pam.service.dto.AppointmentUpdateDTO;
-import com.pollex.pam.service.dto.ClosedProcessDTO;
-import com.pollex.pam.service.dto.DoneProcessDTO;
+import com.pollex.pam.service.dto.*;
 
-import org.springframework.beans.BeanUtils;
+import com.pollex.pam.service.mapper.AppointmentMapper;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import com.pollex.pam.service.AppointmentService;
+import com.pollex.pam.service.PersonalNotificationService;
 import com.pollex.pam.service.SatisfactionService;
-import com.pollex.pam.service.dto.AppointmentCloseDTO;
-import com.pollex.pam.service.dto.AppointmentCreateDTO;
-import com.pollex.pam.service.dto.AppointmentCustomerViewDTO;
+
+import java.util.Objects;
 
 @RestController
 @RequestMapping("/api/appointment")
@@ -27,18 +25,25 @@
 	@Autowired
 	AppointmentService appointmentService;
 
+    @Autowired
+    AppointmentMapper appointmentMapper;
+
 	@Autowired
 	SatisfactionService satisfactionService;
 
     @Autowired
     SendMsgService sendMsgService;
-    
+
     @Autowired
     AppointmentProcess abstractAppointmentProcess;
 
+    @Autowired
+    PersonalNotificationService personalNotificationService;
+
     @PutMapping("")
-    public ResponseEntity<Void> updateAppointment(@RequestBody AppointmentUpdateDTO appointment) {
-        appointmentService.updateAppointment(appointment);
+    public ResponseEntity<Void> updateAppointment(@RequestBody AppointmentUpdateDTO dto) {
+    	Appointment appointment = appointmentService.updateAppointment(dto);
+        personalNotificationService.createUpdateAppointmentToConsultant(appointment);
         return ResponseEntity.noContent().build();
     }
 
@@ -49,9 +54,11 @@
     }
 
 	@PostMapping("/customer/create")
-	public void clientCreateAppointment(@RequestBody AppointmentCreateDTO appointmentCreateDTO) {
+	public AppointmentDTO clientCreateAppointment(@RequestBody AppointmentCreateDTO appointmentCreateDTO) {
         Appointment appointment = appointmentService.customerCreateAppointment(appointmentCreateDTO);
         appointmentService.sendAppointmentNotify(appointment);
+
+        return appointmentMapper.toAppointmentDTO(appointment);
     }
 
 	@PostMapping("/markAsContacted/{appointmentId}")
@@ -70,16 +77,30 @@
         appointmentService.recordConsultantReadTime(appointmentId);
         return ResponseEntity.noContent().build();
     }
-	
+
 	@PostMapping("/close")
     public ResponseEntity<Void> closeAppointment(@RequestBody AppointmentCloseDTO closeDTO) {
 		appointmentService.closeAppointment(closeDTO);
         return ResponseEntity.noContent().build();
     }
-	
+
+    @GetMapping("/customer/expiring/newest")
+    public ResponseEntity<AppointmentCustomerViewDTO> getNewestExpiringAppointment() {
+        Long customerId = SecurityUtils.getCustomerDBId();
+        AppointmentCustomerViewDTO customerNewestExpiringAppointment = appointmentService.getCustomerNewestExpiringAppointment(customerId);
+
+        return new ResponseEntity<>(customerNewestExpiringAppointment, HttpStatus.OK);
+    }
+
+    @GetMapping("/consultant/pending/sum")
+    public ResponseEntity<Long> getConsultantPendingAppointmentSum() {
+        String agentNo = SecurityUtils.getAgentNo();
+        return new ResponseEntity<>(appointmentService.getConsultantPendingAppointmentSum(agentNo), HttpStatus.OK);
+    }
+
 //	@PostMapping("/close/info/edit")
 //    public ResponseEntity<Void> editAppointmentClosedInfo(@RequestBody AppointmentCloseDTO closeDTO) {
-//		
+//
 //		if(closeDTO.getContactStatus() == ContactStatusEnum.DONE) {
 //			DoneProcessDTO dto = new DoneProcessDTO();
 //			BeanUtils.copyProperties(closeDTO, dto);
@@ -91,7 +112,7 @@
 //		}else {
 //			return ResponseEntity.notFound().build();
 //		}
-//		
+//
 //        return ResponseEntity.noContent().build();
 //    }
 }

--
Gitblit v1.8.0