From 99367ea1c11a68b420936e7f7db5fa7367da4f44 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 22 一月 2025 11:44:54 +0800
Subject: [PATCH] 全部代码、数据库提交
---
xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/service/impl/MeditationEverydayServiceImpl.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/service/impl/MeditationEverydayServiceImpl.java b/xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/service/impl/MeditationEverydayServiceImpl.java
index 2544863..ae3fdeb 100644
--- a/xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/service/impl/MeditationEverydayServiceImpl.java
+++ b/xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/service/impl/MeditationEverydayServiceImpl.java
@@ -16,8 +16,12 @@
import java.util.List;
import java.util.Optional;
+
+import com.xinquan.user.api.feign.RemoteAppUserService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
/**
* <p>
@@ -33,6 +37,8 @@
private final MeditationMapper meditationMapper;
private final MeditationMusicMapper meditationMusicMapper;
+ @Resource
+ private RemoteAppUserService remoteAppUserService;
/**
@@ -47,8 +53,8 @@
String now = DateUtils.dateTimeNow("HH:mm:ss");
// 查询播放时间段在当前时间的每日冥想
Optional<MeditationEveryday> meditationEverydayOpt = this.lambdaQuery()
- .ge(MeditationEveryday::getStartPlayTime, now)
- .le(MeditationEveryday::getEndPlayTime, now)
+ .le(MeditationEveryday::getStartPlayTime, now)
+ .ge(MeditationEveryday::getEndPlayTime, now)
.orderByDesc(MeditationEveryday::getUpdateTime)
.last("limit 1").oneOpt();
if (!meditationEverydayOpt.isPresent()) {
@@ -75,6 +81,9 @@
vo = BeanUtils.copyBean(meditationEveryday,
ClientMeditationEverydayVO.class);
clientMeditationVO.setBackgroundUrl(meditationOpt.get().getBackgroundUrl());
+ // 查询冥想实际学习人数
+ Long data = remoteAppUserService.getMeditationHistoryCount(meditationId).getData();
+ clientMeditationVO.setRealLearnedNum(Integer.valueOf(data+""));
vo.setClientMeditationVO(clientMeditationVO);
if (meditation!=null){
List<MeditationMusic> meditationId1 = meditationMusicMapper.selectList(new QueryWrapper<MeditationMusic>()
--
Gitblit v1.7.1