From a8ce0925a0b89728d750e72c2bd2ceceaa073b76 Mon Sep 17 00:00:00 2001
From: cjw <miko20001@163.com>
Date: Sat, 24 Aug 2024 11:26:57 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=8E=B7=E5=8F=96=E9=A2=84?=
 =?UTF-8?q?=E7=BA=A6=E6=97=A5=E5=8E=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/wx/WxCounselorController.java  | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxCounselorController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxCounselorController.java
index 769a228..4219b2d 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxCounselorController.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxCounselorController.java
@@ -102,15 +102,26 @@ public class WxCounselorController extends BaseController {
     }
 
     /**
-     * 获取咨询师预约日历
+     * 获取咨询师预约日历-咨询师自己
+     *
+     * @param time 年-月
+     * @return
+     */
+    @GetMapping("/date")
+    public R<List<ReservationDateVo>> getReservationList(String time) {
+        Long counselorId = LoginHelper.getUserId();
+        return R.ok(reservationService.selectUseDateList(time, counselorId));
+    }
+
+    /**
+     * 获取咨询师预约日历-客户
      *
      * @param time 年-月
      * @return
      */
     @GetMapping("/reservation/date")
-    public R<List<ReservationDateVo>> getReservationList(String time) {
-        Long userId = LoginHelper.getUserId();
-        return R.ok(reservationService.selectUseDateList(time, userId));
+    public R<List<ReservationDateVo>> getReservationList(String time, Long counselorId) {
+        return R.ok(reservationService.selectNotUseDateList(time, counselorId));
     }
 
     /**