From a25a6ebd1f147210a711534d652b989338714ea1 Mon Sep 17 00:00:00 2001
From: cjw <miko20001@163.com>
Date: Fri, 23 Aug 2024 16:20:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=92=A8=E8=AF=A2=E5=B8=88=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scale/controller/wx/WxCounselorController.java     |  9 +++------
 .../java/org/dromara/scale/domain/vo/CounselorVo.java  |  7 ++++++-
 .../scale/service/impl/CounselorServiceImpl.java       | 10 +++++++++-
 3 files changed, 18 insertions(+), 8 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 391677c..e81d13d 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
@@ -1,6 +1,5 @@
 package org.dromara.scale.controller.wx;
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
 import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
@@ -46,14 +45,12 @@ public class WxCounselorController extends BaseController {
     private final ICounselorExperienceService experienceService;
 
 
-
     /**
      * 查询心理咨询师列表
      */
-    @SaCheckPermission("sys:counselor:list")
-    @GetMapping("/list")
-    public TableDataInfo<CounselorVo> list(CounselorBo bo, PageQuery pageQuery) {
-        return counselorService.queryPageList(bo, pageQuery);
+    @GetMapping("/pageList")
+    public TableDataInfo<CounselorVo> list(QueryCounselorBo bo, PageQuery pageQuery) {
+        return counselorService.queryPageList4Wx(bo, pageQuery);
     }
 
     /**
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 83358ff..a86ed2c 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
@@ -62,7 +62,6 @@ public class CounselorVo implements Serializable {
     /**
      * 封面组
      */
-
     private String covers;
 
     @Translation(type = TransConstant.OSS_ID_TO_URL)
@@ -116,5 +115,11 @@ public class CounselorVo implements Serializable {
      */
     private String goodRate;
 
+    @Translation(type = TransConstant.OSS_ID_TO_URL)
+    private Long avatarUrl;
+    /**
+     * 咨询数量
+     */
+    private Integer reservationNum;
 
 }
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 c3ef18e..26fb053 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
@@ -117,7 +117,15 @@ public class CounselorServiceImpl implements ICounselorService {
 
     @Override
     public TableDataInfo<CounselorVo> queryPageList4Wx(QueryCounselorBo bo, PageQuery pageQuery) {
-        return null;
+        LambdaQueryWrapper<Counselor> lqw = new LambdaQueryWrapper<>();
+        Page<CounselorVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        List<CounselorVo> records = result.getRecords();
+        for (CounselorVo one : records) {
+            SysUserVo user = userService.selectUserById(one.getId());
+            one.setAvatarUrl(user.getAvatar());
+            one.setReservationNum(100);
+        }
+        return TableDataInfo.build(result);
     }
 
     /**