From 02f18587bd8860b305e2c688e20465be166bb48c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 22 七月 2021 15:14:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java
index 4501ff9..ff84220 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java
@@ -71,6 +71,8 @@
private ComActNeighborCircleBrowseDAO comActNeighborCircleBrowseDAO;
@Resource
private ComActDAO comActDAO;
+ @Resource
+ private ComActNeighborCircleTopicMapper comActNeighborCircleTopicMapper;
/**
* 分页查询邻里圈列表
@@ -276,6 +278,21 @@
public R neighborExamineByApp(ComActNeighborCircleAppDTO neighborCircleAppDTO){
IPage<ComActNeighborCircleAppVO> neighborCircleIPage = this.baseMapper.neighborExamineByApp(
new Page<>(neighborCircleAppDTO.getPageNum(),neighborCircleAppDTO.getPageSize()),neighborCircleAppDTO.getUserId());
+ if(!neighborCircleIPage.getRecords().isEmpty()) {
+ for (ComActNeighborCircleAppVO circleAppVO : neighborCircleIPage.getRecords()) {
+ //查询点赞信息
+ ComActNeighborCircleFabulousDO circleFabulousDO = comActNeighborCircleFabulousDAO.selectOne(
+ new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda().eq(ComActNeighborCircleFabulousDO::getParentId, circleAppVO.getId())
+ .eq(ComActNeighborCircleFabulousDO::getUserId, neighborCircleAppDTO.getUserId())
+ .eq(ComActNeighborCircleFabulousDO::getType, ComActNeighborCircleFabulousDO.type.llq)
+ .eq(ComActNeighborCircleFabulousDO::getIsEffective, ComActNeighborCircleFabulousDO.isEffective.yes));
+ if (circleFabulousDO != null) {
+ circleAppVO.setHaveSign(1);
+ } else {
+ circleAppVO.setHaveSign(2);
+ }
+ }
+ }
return R.ok(neighborCircleIPage);
}
@@ -298,7 +315,8 @@
ComActNeighborCircleFabulousDO oldCircleFabulousDO = comActNeighborCircleFabulousDAO.selectOne(
new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda().eq(ComActNeighborCircleFabulousDO::getType,ComActNeighborFabulousAppDTO.type.llq)
.eq(ComActNeighborCircleFabulousDO::getParentId,fabulousAppDTO.getServiceId())
- .eq(ComActNeighborCircleFabulousDO::getIsEffective,ComActNeighborCircleFabulousDO.isEffective.yes));
+ .eq(ComActNeighborCircleFabulousDO::getIsEffective,ComActNeighborCircleFabulousDO.isEffective.yes)
+ .eq(ComActNeighborCircleFabulousDO::getUserId,fabulousAppDTO.getUserId()));
if(oldCircleFabulousDO != null){
return R.fail("您已点赞");
}
@@ -523,13 +541,19 @@
@Override
public R detailNeighborByAdmin(Long id) {
ComActNeighborCircleDO comActNeighborCircleDO = this.baseMapper.selectById(id);
- AdministratorsUserVO user = this.baseMapper.selectUserByUserId(comActNeighborCircleDO.getReleaseId());
if (comActNeighborCircleDO == null) {
return R.fail("id有误");
}
+ AdministratorsUserVO user = this.baseMapper.selectUserByUserId(comActNeighborCircleDO.getReleaseId());
DetailNeighborCircleAdminVO vo = new DetailNeighborCircleAdminVO();
BeanUtils.copyProperties(comActNeighborCircleDO, vo);
vo.setReleaseName(user.getName());
+
+ //查询话题名称
+ if(comActNeighborCircleDO.getTopicId() != null){
+ ComActNeighborCircleTopicDO circleTopicDO = comActNeighborCircleTopicMapper.selectById(comActNeighborCircleDO.getTopicId());
+ vo.setTopicName(circleTopicDO.getName());
+ }
return R.ok(vo);
}
@@ -559,7 +583,7 @@
if(neighborCircleDO != null){
if(dto.getStatus().equals(2)){
neighborCircleDO.setCommentNum(neighborCircleDO.getCommentNum() - 1);
- }else if(dto.getStatus().equals(1)){
+ }else{
neighborCircleDO.setCommentNum(neighborCircleDO.getCommentNum() + 1);
}
this.baseMapper.updateById(neighborCircleDO);
@@ -576,7 +600,8 @@
AdministratorsUserVO user = this.baseMapper.selectUserByUserId(commentDO.getUserId());
ComActNeighborCommentByAdminVO vo = new ComActNeighborCommentByAdminVO();
BeanUtils.copyProperties(commentDO,vo);
- vo.setUserName(user.getName());
+ String name = user.getName()==null?user.getNickName():user.getName();
+ vo.setUserName(name);
return R.ok(vo);
}
--
Gitblit v1.7.1