From 4d0e9649c4f47c1721cb2d2306d2bf0928fa748d Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期三, 10 十一月 2021 16:09:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 pamapi/src/main/java/com/pollex/pam/web/rest/ConsultantResource.java |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/pamapi/src/main/java/com/pollex/pam/web/rest/ConsultantResource.java b/pamapi/src/main/java/com/pollex/pam/web/rest/ConsultantResource.java
index 92e841e..eb20daf 100644
--- a/pamapi/src/main/java/com/pollex/pam/web/rest/ConsultantResource.java
+++ b/pamapi/src/main/java/com/pollex/pam/web/rest/ConsultantResource.java
@@ -18,7 +18,7 @@
         this.consultantService = consultantService;
     }
 
-    @GetMapping("")
+    @GetMapping("/favorite")
     public ResponseEntity<List<ConsultantDTO>> getMyConsultantList() {
         List<ConsultantDTO> myConsultants = consultantService.getMyConsultantList();
         return new ResponseEntity<>(myConsultants, HttpStatus.OK);
@@ -30,27 +30,33 @@
         return new ResponseEntity<>(recommendConsultantList, HttpStatus.OK);
     }
 
-    @PostMapping("")
-    public ResponseEntity<Void> addConsultantToOwnList(@RequestBody AddConsultantParam param) {
-        consultantService.addConsultantToOwnList(param);
+    @PostMapping("/favorite")
+    public ResponseEntity<Void> addConsultantToCustomList(@RequestBody AddConsultantParam param) {
+        consultantService.addConsultantToCustomList(param);
         return new ResponseEntity<>(HttpStatus.ACCEPTED);
     }
 
-    @GetMapping("/strictQuery")
+    @PostMapping("/strictQuery")
     public ResponseEntity<List<ConsultantDTO>> strictQueryConsultant(@RequestBody StrictQueryConsultantParam param) {
         List<ConsultantDTO> queryResult = consultantService.strictQueryConsultant(param);
         return new ResponseEntity<>(queryResult, HttpStatus.OK);
     }
 
-    @GetMapping("/fastQuery")
+    @PostMapping("/fastQuery")
     public ResponseEntity<List<ConsultantDTO>> fastQueryConsultant(@RequestBody FastQueryConsultantParam param) {
         List<ConsultantDTO> queryResult = consultantService.fastQueryConsultant(param);
         return new ResponseEntity<>(queryResult, HttpStatus.OK);
     }
 
-    @GetMapping("/{agentNo}")
-    public ResponseEntity<ConsultantDetailDTO> getConsultantDetail(@PathVariable String agentNo) {
+    @GetMapping("/detail")
+    public ResponseEntity<ConsultantDetailDTO> getConsultantDetail(@RequestParam("agentNo") String agentNo) {
         ConsultantDetailDTO result = consultantService.getConsultantDetail(agentNo);
         return new ResponseEntity<>(result, HttpStatus.OK);
     }
+    
+    @GetMapping("/getMyAppointment")
+    public List<AppointmentCustomerViewDTO> getMyAppointment() {
+    	return consultantService.getMyAppointment();
+    }
+    
 }

--
Gitblit v1.8.0