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> getReservationList(String time) { + Long counselorId = LoginHelper.getUserId(); + return R.ok(reservationService.selectUseDateList(time, counselorId)); + } + + /** + * 获取咨询师预约日历-客户 * * @param time 年-月 * @return */ @GetMapping("/reservation/date") - public R> getReservationList(String time) { - Long userId = LoginHelper.getUserId(); - return R.ok(reservationService.selectUseDateList(time, userId)); + public R> getReservationList(String time, Long counselorId) { + return R.ok(reservationService.selectNotUseDateList(time, counselorId)); } /**