From 95ff4c76c68947034a38f76a01379024e6f4b879 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期五, 24 九月 2021 18:54:02 +0800
Subject: [PATCH] Merge branch 'four_member' into 'test'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 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 2139a1d..5e10984 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
@@ -6,6 +6,7 @@
import javax.annotation.Resource;
+import com.panzhihua.service_community.service.ComActNeighborCircleTopicService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -61,6 +62,8 @@
private ComActDAO comActDAO;
@Resource
private ComActNeighborCircleTopicMapper comActNeighborCircleTopicMapper;
+ @Resource
+ private ComActNeighborCircleTopicService comActNeighborCircleTopicService;
/**
* 分页查询邻里圈列表
@@ -123,6 +126,25 @@
}
if (StringUtils.isNotEmpty(addNeighborCircleAppDTO.getPhone())) {
neighborCircleDO.setReleasePhone(addNeighborCircleAppDTO.getPhone());
+ }
+ //判断用户的话题是否是新增的
+ if(StringUtils.isNotEmpty(addNeighborCircleAppDTO.getTopicName())){
+ //新增邻里圈话题
+ ComActNeighborCircleTopicDO circleTopicDO = comActNeighborCircleTopicMapper.selectOne(new QueryWrapper<ComActNeighborCircleTopicDO>()
+ .lambda().eq(ComActNeighborCircleTopicDO::getCommunityId,neighborCircleDO.getCommunityId())
+ .eq(ComActNeighborCircleTopicDO::getName,addNeighborCircleAppDTO.getTopicName()));
+ if(circleTopicDO == null){
+ circleTopicDO = new ComActNeighborCircleTopicDO();
+ circleTopicDO.setCommunityId(neighborCircleDO.getCommunityId());
+ circleTopicDO.setName(addNeighborCircleAppDTO.getTopicName());
+ circleTopicDO.setCreateBy(neighborCircleDO.getReleaseId());
+ circleTopicDO.setCreateAt(new Date());
+ circleTopicDO.setCount(0);
+ circleTopicDO.setHotNum(0L);
+ circleTopicDO.setStatus(ComActNeighborCircleTopicDO.status.yes);
+ comActNeighborCircleTopicMapper.insert(circleTopicDO);
+ }
+ neighborCircleDO.setTopicId(circleTopicDO.getId());
}
//判断当前邻里圈是否需要审核
if(addNeighborCircleAppDTO.getIsExamine().equals(AddComActNeighborCircleAppDTO.isExamine.no)){
@@ -697,6 +719,7 @@
BeanUtils.copyProperties(commentDO, vo);
String name = user.getName() == null ? user.getNickName() : user.getName();
vo.setUserName(name);
+ vo.setUserPhone(user.getPhone());
return R.ok(vo);
}
--
Gitblit v1.7.1