bug修改

无关风月

2025-04-03 b01f752252eaadd1fa31eda6a9ad43146660b721

 xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/service/impl/MeditationEverydayServiceImpl.java

@@ -2,16 +2,19 @@

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.xinquan.common.core.domain.R;
import com.xinquan.common.core.utils.DateUtils;
import com.xinquan.common.core.utils.page.BeanUtils;
import com.xinquan.meditation.api.domain.Meditation;
import com.xinquan.meditation.domain.MeditationEveryday;
import com.xinquan.meditation.domain.MeditationMusic;
import com.xinquan.meditation.domain.MeditationVideo;
import com.xinquan.meditation.domain.vo.ClientMeditationEverydayVO;
import com.xinquan.meditation.domain.vo.ClientMeditationVO;
import com.xinquan.meditation.mapper.MeditationEverydayMapper;
import com.xinquan.meditation.mapper.MeditationMapper;
import com.xinquan.meditation.mapper.MeditationMusicMapper;
import com.xinquan.meditation.mapper.MeditationVideoMapper;
import com.xinquan.meditation.service.MeditationEverydayService;

import java.util.List;
@@ -40,6 +43,8 @@
    @Resource
    private RemoteAppUserService remoteAppUserService;

    @Resource
    private MeditationVideoMapper meditationVideoMapper;

    /**
     * 查询每日冥想
@@ -49,12 +54,14 @@
    @Override
    public ClientMeditationEverydayVO getTodayMeditation() {
        ClientMeditationEverydayVO vo = new ClientMeditationEverydayVO();


        // 当前时间
        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()) {
@@ -98,6 +105,13 @@
            vo.setImageUrl(meditationEveryday.getImageUrl());

        }
        MeditationVideo meditationVideo = meditationVideoMapper.selectOne(null);
        if (meditationVideo==null){
            vo.setIsShow(0);
        }else{
            vo.setIsShow(meditationVideo.getIsShow());
            vo.setMeditationVideo(meditationVideo);
        }
        return vo;
    }
}