From 353cf91d3679e68d9b8c07652e4f7791d606dbd4 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 15 十一月 2024 15:14:39 +0800
Subject: [PATCH] 代码提交
---
xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/service/impl/MeditationServiceImpl.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 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 ecb2c04..d14540d 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
@@ -95,10 +95,14 @@
}else{
voList = baseMapper.getMeditationListByTagId(null, null);
}
- voList = handlePaidMeditation(voList);
+ if(voList.isEmpty()){
+ voList = baseMapper.getMeditationListByTagId(null, null);
+ voList = voList.stream().limit(1).collect(Collectors.toList());
+ }
return voList;
}else{
voList = baseMapper.getMeditationListByTagId(null, null);
+ voList = voList.stream().limit(1).collect(Collectors.toList());
return voList;
}
}
@@ -143,6 +147,7 @@
AppUser appUser = getCurrentUser();
LambdaQueryWrapper<Meditation> meditationLambdaQueryWrapper = new LambdaQueryWrapper<>();
meditationLambdaQueryWrapper.eq(Meditation::getCateId, cateId);
+ meditationLambdaQueryWrapper.eq(Meditation::getListingStatus, 1);
if (appUser!=null){
if (appUser.getSanskritFlag() == 2){
meditationLambdaQueryWrapper.eq(Meditation::getSanskrit, 2);
@@ -344,7 +349,7 @@
if (data1.getVipExpireTime()!=null && data1.getVipExpireTime().isAfter(LocalDateTime.now())){
vo.setIsVip(1);
}else{
- vo.setIsVip(0);
+ vo.setIsVip(2);
}
Integer data = remoteOrderService.getMeditationIsBuy(data1.getId(), id).getData();
vo.setIsBuy(data);
@@ -380,8 +385,18 @@
if (tokenService.getLoginUser()!=null){
Integer data2 = remoteOrderService.getMeditationIsBuy(tokenService.getLoginUser().getUserid(), id).getData();
vo.setIsBuy(data2);
+ List<MeditationUserFavorite> list = meditationUserFavoriteService.lambdaQuery()
+ .eq(MeditationUserFavorite::getMeditationId, id)
+ .eq(MeditationUserFavorite::getAppUserId, tokenService.getLoginUser().getUserid()).list();
+
+ if (list.isEmpty()){
+ vo.setFavorite(2);
+ }else{
+ vo.setFavorite(1);
+ }
}
+
return R.ok(vo);
}
@Override
--
Gitblit v1.7.1