From b01f752252eaadd1fa31eda6a9ad43146660b721 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 03 四月 2025 23:42:57 +0800
Subject: [PATCH] bug修改

---
 xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/service/MeditationService.java |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/service/MeditationService.java b/xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/service/MeditationService.java
index d436295..0a13c18 100644
--- a/xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/service/MeditationService.java
+++ b/xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/service/MeditationService.java
@@ -1,8 +1,10 @@
 package com.xinquan.meditation.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.xinquan.common.core.domain.R;
 import com.xinquan.common.core.utils.page.PageDTO;
-import com.xinquan.meditation.domain.Meditation;
+import com.xinquan.meditation.api.domain.Meditation;
+import com.xinquan.meditation.domain.MeditationHall;
 import com.xinquan.meditation.domain.vo.ClientMeditationAndCateVO;
 import com.xinquan.meditation.domain.vo.ClientMeditationDetailsVO;
 import com.xinquan.meditation.domain.vo.ClientMeditationQuestionVO;
@@ -68,7 +70,8 @@
      * @param id 冥想音频id
      * @return 客户端冥想详情视图对象
      */
-    ClientMeditationDetailsVO getMeditationDetails(Long id);
+    R<ClientMeditationDetailsVO> getMeditationDetails(Long id);
+    ClientMeditationDetailsVO getMeditationDetails1(Long id);
 
     /**
      * 获取冥想音频提问列表-分页
@@ -80,6 +83,8 @@
      */
     PageDTO<ClientMeditationQuestionVO> getMeditationQuestionPage(Long id,
             Integer pageCurr, Integer pageSize);
+    PageDTO<ClientMeditationQuestionVO> getMeditationQuestionPageShare(Long id,
+            Integer pageCurr, Integer pageSize);
 
     /**
      * 收藏/取消收藏
@@ -87,4 +92,7 @@
      * @param id 冥想音频id
      */
     void favorite(Long id);
+
+    PageDTO<MeditationHall> getMeditationPage(String lon, String lat,String name, Integer pageCurr, Integer pageSize);
+
 }

--
Gitblit v1.7.1