From 8c0b5b30e5200e7bd45aa34507c3623e17fcce91 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 24 八月 2023 13:47:24 +0800
Subject: [PATCH] 新增小程序积分列表 修改积分发放流程
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.java | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.java
index 7eba41a..05c92b1 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.java
@@ -5,6 +5,9 @@
import javax.annotation.Resource;
+import com.panzhihua.common.model.vos.community.DataCount;
+import com.panzhihua.service_community.dao.ComActDynTypeMapper;
+import com.panzhihua.service_community.model.dos.ComActDynTypeDO;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
@@ -25,6 +28,7 @@
import com.panzhihua.service_community.service.ComActDynService;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.StringUtils;
import static java.util.Objects.nonNull;
@@ -43,6 +47,9 @@
private ComActDynUserDAO comActDynUserDAO;
@Resource
private ComActDAO comActDAO;
+
+ @Resource
+ private ComActDynTypeMapper comActDynTypeMapper;
/**
* 分页查询社区动态
@@ -64,14 +71,19 @@
}
page.setSize(pageSize);
page.setCurrent(pageNum);
+
IPage<ComActDynVO> iPage = comActDynDAO.pageDynamic(page, comActDynVO);
List<ComActDynVO> records = iPage.getRecords();
if (!ObjectUtils.isEmpty(records)) {
records.forEach(comActDynVO1 -> {
- String content = comActDynVO1.getContent();
- if (!ObjectUtils.isEmpty(content)) {
- String text = RichTextUtil.getText(content);
- comActDynVO1.setContentText(text);
+ if(comActDynVO1.getCategory()!=null&&comActDynVO1.getCategory()==4){
+ comActDynVO1.setContent(null);
+ }else {
+ String content = comActDynVO1.getContent();
+ if (!ObjectUtils.isEmpty(content)) {
+ String text = RichTextUtil.getText(content);
+ comActDynVO1.setContentText(text);
+ }
}
});
}
@@ -88,6 +100,9 @@
@Override
public R detailDynamic(Long id) {
ComActDynDO comActDynDO = this.getById(id);
+
+ ComActDynTypeDO comActDynTypeDO=comActDynTypeMapper.selectById(comActDynDO.getType());
+
if (ObjectUtils.isEmpty(comActDynDO)) {
return R.fail("社区动态不存在");
}
@@ -104,8 +119,18 @@
}
}
if(comActDynDO.getCategory()==4){
- comActDynDO.setReadNum(comActDynDO.getReadNum()+1);
+ if(comActDynDO.getReadNum()!=null){
+ comActDynDO.setReadNum(comActDynDO.getReadNum()+1);
+ }
+ else {
+ comActDynDO.setReadNum(1);
+ }
comActDynDAO.updateById(comActDynDO);
+ }
+
+ if(comActDynTypeDO!=null && !StringUtils.isEmpty(comActDynTypeDO.getName()))
+ {
+ comActDynVO.setTypeName(comActDynTypeDO.getName());
}
return R.ok(comActDynVO);
}
@@ -190,4 +215,5 @@
return R.ok(iPage);
}
+
}
--
Gitblit v1.7.1