From c790894d86cec48bd326bab0153478d99f7c8981 Mon Sep 17 00:00:00 2001 From: cjw Date: Wed, 21 Aug 2024 14:45:05 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E5=8A=9F=E8=83=BD=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/wx/WxCounselorController.java | 27 ++++++++++++------ .../dromara/scale/domain/vo/CounselorVo.java | 10 +++++++ .../scale/domain/vo/ReservationDateVo.java | 2 +- .../scale/domain/vo/ReservationOrderVo.java | 28 +++++++++++++++++++ .../scale/mapper/ReservationDayMapper.java | 3 ++ .../scale/service/ICounselorService.java | 8 ++++++ .../scale/service/IReservationService.java | 5 +++- .../service/impl/CounselorServiceImpl.java | 10 +++++++ .../service/impl/ReservationServiceImpl.java | 6 ++++ .../mapper/scale/ReservationDayMapper.xml | 20 +++++++++++-- 10 files changed, 105 insertions(+), 14 deletions(-) create mode 100644 ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ReservationOrderVo.java 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 f71685b..7b179ad 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 @@ -13,10 +13,7 @@ import org.dromara.scale.domain.bo.CounselorBo; import org.dromara.scale.domain.bo.CounselorExperienceBo; import org.dromara.scale.domain.bo.CounselorQualificationBo; import org.dromara.scale.domain.bo.ReservationDayBo; -import org.dromara.scale.domain.vo.CounselorExperienceVo; -import org.dromara.scale.domain.vo.CounselorQualificationVo; -import org.dromara.scale.domain.vo.CounselorVo; -import org.dromara.scale.domain.vo.ReservationDateVo; +import org.dromara.scale.domain.vo.*; import org.dromara.scale.service.ICounselorExperienceService; import org.dromara.scale.service.ICounselorQualificationService; import org.dromara.scale.service.ICounselorService; @@ -69,13 +66,25 @@ public class WxCounselorController extends BaseController { /** * 获取咨询师预约日历 * - * @param time 年-月 - * @param counselorId 咨询师id + * @param time 年-月 * @return */ - @GetMapping("/date") - public R> getReservationList(String time, Long counselorId) { - return R.ok(reservationService.selectDateList(time, counselorId)); + @GetMapping("/reservation/date") + public R> getReservationList(String time) { + Long userId = LoginHelper.getUserId(); + return R.ok(reservationService.selectDateList(time, userId)); + } + + /** + * 获取预约订单 + * + * @param time 年-月 + * @return + */ + @GetMapping("/reservation/order") + public R> getReservationOrder(String time) { + Long userId = LoginHelper.getUserId(); + return R.ok(reservationService.selectOrderList(time, userId)); } /** diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/CounselorVo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/CounselorVo.java index 3443018..061d21e 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/CounselorVo.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/CounselorVo.java @@ -91,5 +91,15 @@ public class CounselorVo implements Serializable { */ private String countyCode; + /** + * 家庭住址 + */ + private String address; + + /** + * 用户性别 + */ + private String sex; + } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ReservationDateVo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ReservationDateVo.java index 24235f5..ae6ae30 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ReservationDateVo.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ReservationDateVo.java @@ -6,7 +6,7 @@ import java.io.Serial; import java.io.Serializable; /** - *

TODO

+ *

预约日历表

* * @author cjw * @version V1.0.0 diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ReservationOrderVo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ReservationOrderVo.java new file mode 100644 index 0000000..448842c --- /dev/null +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ReservationOrderVo.java @@ -0,0 +1,28 @@ +package org.dromara.scale.domain.vo; + +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +/** + *

预约订单

+ * + * @author cjw + * @version V1.0.0 + * @date 2024/8/20 10:23 + */ +@Data +public class ReservationOrderVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + private String name; + + private String startTime; + + private String endTime; + + private Integer status; +} diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ReservationDayMapper.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ReservationDayMapper.java index 0b0e921..84f1a9b 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ReservationDayMapper.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ReservationDayMapper.java @@ -6,6 +6,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.scale.domain.ReservationDay; import org.dromara.scale.domain.vo.ReservationDateVo; import org.dromara.scale.domain.vo.ReservationDayVo; +import org.dromara.scale.domain.vo.ReservationOrderVo; import java.util.List; @@ -19,4 +20,6 @@ import java.util.List; public interface ReservationDayMapper extends BaseMapperPlus { List selectDateList(@Param("time") String time, @Param("userId") Long userId); + + List selectOrderList(@Param("time") String time, @Param("userId") Long userId); } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ICounselorService.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ICounselorService.java index fc85bc2..c925c8c 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ICounselorService.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ICounselorService.java @@ -23,6 +23,14 @@ public interface ICounselorService { */ CounselorVo queryById(Long id); + /** + * 查询心理咨询师-微信端 + * + * @param id 主键 + * @return 心理咨询师 + */ + CounselorVo queryCounselorVoById(Long id); + /** * 分页查询心理咨询师列表 * diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IReservationService.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IReservationService.java index c92078c..bdd5ab9 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IReservationService.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IReservationService.java @@ -2,6 +2,7 @@ package org.dromara.scale.service; import org.dromara.scale.domain.bo.ReservationDayBo; import org.dromara.scale.domain.vo.ReservationDateVo; +import org.dromara.scale.domain.vo.ReservationOrderVo; import java.util.List; @@ -15,5 +16,7 @@ public interface IReservationService { */ Boolean insertByBo(ReservationDayBo bo); - List selectDateList(String time, Long userId); + List selectDateList(String time, Long counselorId); + + List selectOrderList(String time, Long counselorId); } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/CounselorServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/CounselorServiceImpl.java index d41f6ba..b0c20f0 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/CounselorServiceImpl.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/CounselorServiceImpl.java @@ -17,6 +17,7 @@ import org.dromara.scale.domain.vo.CounselorVo; import org.dromara.scale.mapper.CounselorMapper; import org.dromara.scale.service.ICounselorService; import org.dromara.system.domain.bo.SysUserBo; +import org.dromara.system.domain.vo.SysUserVo; import org.dromara.system.service.ISysUserService; import org.springframework.stereotype.Service; @@ -49,6 +50,15 @@ public class CounselorServiceImpl implements ICounselorService { return baseMapper.selectVoById(id); } + @Override + public CounselorVo queryCounselorVoById(Long id) { + CounselorVo counselorVo = baseMapper.selectVoById(id); + SysUserVo user = userService.selectUserById(id); + counselorVo.setAddress(user.getAddress()); + counselorVo.setSex(user.getSex()); + return counselorVo; + } + /** * 分页查询心理咨询师列表 * diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ReservationServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ReservationServiceImpl.java index ec35c6a..975c885 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ReservationServiceImpl.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ReservationServiceImpl.java @@ -10,6 +10,7 @@ import org.dromara.scale.domain.ReservationDay; import org.dromara.scale.domain.ReservationTime; import org.dromara.scale.domain.bo.ReservationDayBo; import org.dromara.scale.domain.vo.ReservationDateVo; +import org.dromara.scale.domain.vo.ReservationOrderVo; import org.dromara.scale.mapper.ReservationDayMapper; import org.dromara.scale.mapper.ReservationTimeMapper; import org.dromara.scale.service.IReservationService; @@ -74,4 +75,9 @@ public class ReservationServiceImpl implements IReservationService { public List selectDateList(String time, Long counselorId) { return dayMapper.selectDateList(time, counselorId); } + + @Override + public List selectOrderList(String time, Long counselorId) { + return dayMapper.selectOrderList(time, counselorId); + } } diff --git a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ReservationDayMapper.xml b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ReservationDayMapper.xml index 7cf7527..82cfdf6 100644 --- a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ReservationDayMapper.xml +++ b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ReservationDayMapper.xml @@ -1,7 +1,7 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + +