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/impl/MeditationServiceImpl.java | 72 ++++++++++++++++++------------------
1 files changed, 36 insertions(+), 36 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 88d114b..2735f72 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
@@ -32,6 +32,7 @@
import com.xinquan.order.api.feign.RemoteOrderService;
import com.xinquan.system.api.domain.AppUser;
import com.xinquan.meditation.api.domain.MeditationQuestion;
+import com.xinquan.system.api.domain.AppUserViewingHistory;
import com.xinquan.system.api.domain.vo.AppUserVO;
import com.xinquan.system.api.model.LoginUser;
import com.xinquan.user.api.domain.dto.AppUserDTO;
@@ -65,6 +66,7 @@
private final MeditationQuestionLikeService meditationQuestionLikeService;
private final MeditationUserFavoriteService meditationUserFavoriteService;
private final RemoteOrderService remoteOrderService;
+ private final MeditationMapper meditationMapper;
/**
* 获取私人订制
*
@@ -119,15 +121,13 @@
if (loginUser==null){
return new ArrayList<>();
}
- Long userId = loginUser.getUserid();
- List<Order> orderList = remoteOrderService.getOrderListByType(userId,
- OrderFromEnum.MEDITATION.getCode(),
- SecurityConstants.INNER).getData();
- List<Long> meditationIdList = orderList.stream().map(Order::getBusinessId)
- .collect(Collectors.toList());
+ Long userId = loginUser.getUserid();
+ List<Order> data1 = remoteOrderService.getMeditationIsBuyAll(userId).getData();
+ List<Long> meditationIdList = data1.stream().map(Order::getBusinessId).collect(Collectors.toList());
if (CollUtils.isNotEmpty(meditationIdList)) {
+ Set<Long> meditationIdSet = new HashSet<>(meditationIdList);
voList = voList.stream()
- .filter(meditationVO -> meditationIdList.contains(meditationVO.getId()))
+ .filter(meditationVO -> meditationIdSet.contains(meditationVO.getId()))
.peek(meditationVO -> meditationVO.setIsBuy(1))
.collect(Collectors.toList());
}
@@ -156,15 +156,10 @@
meditationLambdaQueryWrapper.orderByDesc(Meditation::getSortNum).last("limit 8");
}
List<Meditation> list =this.list(meditationLambdaQueryWrapper);
- List<Meditation> meditations = new ArrayList<>();
- for (Meditation meditation : list) {
- if (meditation.getListingStatus()==1){
- meditations.add(meditation);
- }
- }
- if (CollUtils.isNotEmpty(meditations)) {
+
+ if (CollUtils.isNotEmpty(list)) {
// 对象拷贝
- voList = BeanUtils.copyList(meditations, ClientMeditationVO.class);
+ voList = BeanUtils.copyList(list, ClientMeditationVO.class);
}
handlePaidMeditation(voList);
return voList;
@@ -211,26 +206,20 @@
LoginUser loginUser = tokenService.getLoginUser();
List<ClientMeditationVO> meditationListByCateId = getMeditationListByCateId(cate.getId());
if (loginUser!=null){
+ List<Order> data1 = remoteOrderService.getMeditationIsBuyAll(loginUser.getUserid()).getData();
for (ClientMeditationVO clientMeditationVO : meditationListByCateId) {
- Integer data = remoteOrderService.getMeditationIsBuy(loginUser.getUserid(),clientMeditationVO.getId() ).getData();
- clientMeditationVO.setIsBuy(data);
- Long data1 = remoteAppUserService.getMeditationHistoryCount(clientMeditationVO.getId()).getData();
- clientMeditationVO.setRealLearnedNum(Integer.valueOf(data1+""));
+ Order order = data1.stream().filter(e -> e.getBusinessId().equals(clientMeditationVO.getId())).findFirst().orElse(null);
+ if (order==null){
+ clientMeditationVO.setIsBuy(2);
+ }else{
+ clientMeditationVO.setIsBuy(1);
+ }
clientMeditationVO.setRealLearnedNum(clientMeditationVO.getVirtualLearnedNum()+clientMeditationVO.getRealLearnedNum());
}
}else{
for (ClientMeditationVO clientMeditationVO : meditationListByCateId) {
clientMeditationVO.setIsBuy(2);
- Long data = remoteAppUserService.getMeditationHistoryCount(clientMeditationVO.getId()).getData();
- clientMeditationVO.setRealLearnedNum(Integer.valueOf(data+""));
clientMeditationVO.setRealLearnedNum(clientMeditationVO.getVirtualLearnedNum()+clientMeditationVO.getRealLearnedNum());
- if (tokenService.getLoginUser()!=null){
- Integer data2 = remoteOrderService.getMeditationIsBuy(tokenService.getLoginUser().getUserid()
- ,clientMeditationVO.getId() ).getData();
- clientMeditationVO.setIsBuy(data2);
- }else{
- clientMeditationVO.setIsBuy(2);
- }
}
}
vo.setClientMeditationVOList(meditationListByCateId);
@@ -307,19 +296,29 @@
if (page.getRecords().isEmpty()) {
return pageDTO;
}
+ List<Order> data1 = new ArrayList<Order>();
+
+ if (tokenService.getLoginUser()!=null){
+ data1 = remoteOrderService.getMeditationIsBuyAll(tokenService.getLoginUser().getUserid()).getData();
+ }
+ List<AppUserViewingHistory> data2 = remoteAppUserService.getMeditationHistoryCountAll().getData();
+ boolean temp = tokenService.getLoginUser()!=null;
for (Meditation record : page.getRecords()) {
- Long data = remoteAppUserService.getMeditationHistoryCount(record.getId()).getData();
- record.setRealLearnedNum(Integer.valueOf(data+""));
+ List<AppUserViewingHistory> collect = data2.stream().filter(e -> e.getBizId().equals(record.getId())).collect(Collectors.toList());
+ record.setRealLearnedNum(collect.size());
record.setRealLearnedNum(record.getVirtualLearnedNum()+record.getRealLearnedNum());
- if (tokenService.getLoginUser()!=null){
- Integer data2 = remoteOrderService.getMeditationIsBuy(tokenService.getLoginUser().getUserid()
- ,record.getId() ).getData();
- record.setIsBuy(data2);
+ if (temp){
+ Order order = data1.stream().filter(e -> e.getBusinessId().equals(record.getId())).findFirst().orElse(null);
+ if (order==null){
+ record.setIsBuy(2);
+ }else{
+ record.setIsBuy(1);
+ }
}else{
record.setIsBuy(2);
}
- this.updateById(record);
}
+ this.updateBatchById(page.getRecords());
// 将实体类转换为VO
pageDTO = PageDTO.of(page, ClientMeditationVO.class);
return pageDTO;
@@ -350,6 +349,7 @@
if (loginUser!=null){
Long userid = loginUser.getUserid();
AppUser appUser = remoteAppUserService.getAppUserById(userid + "").getData();
+ if (appUser.getSanskritFlag()==2)
meditationLambdaQueryWrapper.eq(Meditation::getSanskrit, appUser.getSanskritFlag());
}
meditationLambdaQueryWrapper.like(Meditation::getMeditationTitle, condition);
@@ -453,7 +453,7 @@
}
}
-
+ this.updateById(meditation);
return R.ok(vo);
}
@Override
--
Gitblit v1.7.1