[ADD] 成交API新增remark欄位 [UPDATE] 進入顧問流程需一併更新appointment 的狀態 [ADD] 新增檢核不能重複新增a...

Jack

2022-01-14 ec0342f01d418e96822fde75ceb201f78d55e8bb

 pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java

@@ -1,12 +1,22 @@
package com.pollex.pam.web.rest;

import com.pollex.pam.service.dto.AppointmentDTO;
import com.pollex.pam.appointment.process.AppointmentProcess;
import com.pollex.pam.domain.Appointment;
import com.pollex.pam.enums.ContactStatusEnum;
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 org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
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.SatisfactionService;
import com.pollex.pam.service.dto.AppointmentCloseDTO;
import com.pollex.pam.service.dto.AppointmentCreateDTO;
import com.pollex.pam.service.dto.AppointmentCustomerViewDTO;

@@ -20,8 +30,14 @@
   @Autowired
   SatisfactionService satisfactionService;

    @Autowired
    SendMsgService sendMsgService;
    
    @Autowired
    AppointmentProcess abstractAppointmentProcess;

    @PutMapping("")
    public ResponseEntity<Void> updateAppointment(@RequestBody AppointmentDTO appointment) {
    public ResponseEntity<Void> updateAppointment(@RequestBody AppointmentUpdateDTO appointment) {
        appointmentService.updateAppointment(appointment);
        return ResponseEntity.noContent().build();
    }
@@ -34,13 +50,15 @@

   @PostMapping("/customer/create")
   public void clientCreateAppointment(@RequestBody AppointmentCreateDTO appointmentCreateDTO) {
      appointmentService.customerCreateAppointment(appointmentCreateDTO);
   }
        Appointment appointment = appointmentService.customerCreateAppointment(appointmentCreateDTO);
        appointmentService.sendAppointmentNotify(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 +70,22 @@
        appointmentService.recordConsultantReadTime(appointmentId);
        return ResponseEntity.noContent().build();
    }
	
   @PostMapping("/close")
    public ResponseEntity<Void> closeAppointment(@RequestBody AppointmentCloseDTO closeDTO) {
		
      if(closeDTO.getContactStatus() == ContactStatusEnum.DONE) {
         DoneProcessDTO dto = new DoneProcessDTO();
         BeanUtils.copyProperties(closeDTO, dto);
         abstractAppointmentProcess.process(dto);
      }else if(closeDTO.getContactStatus() == ContactStatusEnum.CLOSED){
         ClosedProcessDTO dto = new ClosedProcessDTO();
         BeanUtils.copyProperties(closeDTO, dto);
         abstractAppointmentProcess.process(dto);
      }else {
         return ResponseEntity.notFound().build();
      }
		
        return ResponseEntity.noContent().build();
    }
}