From 3f481005be717250a2ea87ff9367aa84d6a3eb13 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 14 九月 2024 10:55:52 +0800
Subject: [PATCH] 课程代码

---
 xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/service/impl/MeditationServiceImpl.java |   23 +++++++++++++++++------
 1 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/service/impl/MeditationServiceImpl.java b/xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/service/impl/MeditationServiceImpl.java
index d003d07..c290f1b 100644
--- a/xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/service/impl/MeditationServiceImpl.java
+++ b/xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/service/impl/MeditationServiceImpl.java
@@ -10,13 +10,10 @@
 import com.xinquan.common.core.utils.page.BeanUtils;
 import com.xinquan.common.core.utils.page.CollUtils;
 import com.xinquan.common.core.utils.page.PageDTO;
+import com.xinquan.common.core.web.page.PageInfo;
 import com.xinquan.common.security.utils.SecurityUtils;
 import com.xinquan.meditation.api.domain.Meditation;
-import com.xinquan.meditation.domain.MeditationCategory;
-import com.xinquan.meditation.domain.MeditationMusic;
-import com.xinquan.meditation.domain.MeditationQuestion;
-import com.xinquan.meditation.domain.MeditationQuestionLike;
-import com.xinquan.meditation.domain.MeditationUserFavorite;
+import com.xinquan.meditation.domain.*;
 import com.xinquan.meditation.domain.vo.ClientMeditationAndCateVO;
 import com.xinquan.meditation.domain.vo.ClientMeditationCategoryVO;
 import com.xinquan.meditation.domain.vo.ClientMeditationDetailsVO;
@@ -31,7 +28,7 @@
 import com.xinquan.meditation.service.MeditationUserFavoriteService;
 import com.xinquan.order.api.domain.Order;
 import com.xinquan.order.api.feign.RemoteOrderService;
-import com.xinquan.user.api.domain.AppUser;
+import com.xinquan.system.api.domain.AppUser;
 import com.xinquan.user.api.domain.dto.AppUserDTO;
 import com.xinquan.user.api.feign.RemoteAppUserService;
 import java.util.Arrays;
@@ -45,6 +42,7 @@
 import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 
 /**
  * <p>
@@ -303,6 +301,19 @@
         this.updateById(meditation);
     }
 
+    @Override
+    public PageDTO<MeditationHall> getMeditationPage(String lon, String lat,String name, Integer pageCurr, Integer pageSize) {
+        PageInfo<MeditationHall> pageInfo = new PageInfo<>(pageCurr, pageSize);
+        List<MeditationHall> list = this.baseMapper.getMeditationPage(pageInfo,lon, lat,name);
+        if (!StringUtils.hasLength(lon) || !StringUtils.hasLength(lat)){
+            for (MeditationHall meditationHall : list) {
+                meditationHall.setDistance(null);
+            }
+        }
+        pageInfo.setRecords(list);
+        return PageDTO.of(pageInfo, MeditationHall.class);
+    }
+
     /**
      * 获取冥想音频提问列表-分页
      *

--
Gitblit v1.7.1