From a3716f72066d25d745f4d5103ff23a553c3e102b Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期四, 17 二月 2022 11:41:19 +0800
Subject: [PATCH] Merge branch 'sit' into uat

---
 pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java |   82 ++++++++++++++++++++++++++++++++++++-----
 1 files changed, 72 insertions(+), 10 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 1704d11..6a8e6b7 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
@@ -1,14 +1,20 @@
 package com.pollex.pam.web.rest;
 
-import com.pollex.pam.service.dto.AppointmentUpdateDTO;
+import com.pollex.pam.appointment.process.AppointmentProcess;
+import com.pollex.pam.domain.Appointment;
+import com.pollex.pam.security.SecurityUtils;
+import com.pollex.pam.service.SendMsgService;
+import com.pollex.pam.service.dto.*;
+
+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.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.AppointmentCreateDTO;
-import com.pollex.pam.service.dto.AppointmentCustomerViewDTO;
 
 @RestController
 @RequestMapping("/api/appointment")
@@ -17,12 +23,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();
     }
 
@@ -33,14 +52,19 @@
     }
 
 	@PostMapping("/customer/create")
-	public void clientCreateAppointment(@RequestBody AppointmentCreateDTO appointmentCreateDTO) {
-		appointmentService.customerCreateAppointment(appointmentCreateDTO);
-	}
+	public AppointmentDTO clientCreateAppointment(@RequestBody AppointmentCreateDTO appointmentCreateDTO) {
+        Appointment appointment = appointmentService.customerCreateAppointment(appointmentCreateDTO);
+        appointmentService.sendAppointmentNotify(appointment);
+        satisfactionService.createUnfilledSystemSatisfaction(appointment);
+
+        return appointmentMapper.toAppointmentDTO(appointment);
+    }
 
 	@PostMapping("/markAsContacted/{appointmentId}")
-	public void markAsContacted(@PathVariable Long appointmentId) {
+	public AppointmentCustomerViewDTO markAsContacted(@PathVariable Long appointmentId) {
 		appointmentService.markAsContacted(appointmentId);
-	}
+	    return appointmentService.getAppointmentDetail(appointmentId);
+    }
 
 	@GetMapping("/getDetail/{appointmentId}")
 	public AppointmentCustomerViewDTO getAppointmentDetail(@PathVariable Long appointmentId) {
@@ -52,4 +76,42 @@
         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);
+//			abstractAppointmentProcess.editClosedInfo(dto);
+//		}else if(closeDTO.getContactStatus() == ContactStatusEnum.CLOSED){
+//			ClosedProcessDTO dto = new ClosedProcessDTO();
+//			BeanUtils.copyProperties(closeDTO, dto);
+//			abstractAppointmentProcess.editClosedInfo(dto);
+//		}else {
+//			return ResponseEntity.notFound().build();
+//		}
+//
+//        return ResponseEntity.noContent().build();
+//    }
 }

--
Gitblit v1.8.0