From 2e64c232ab6b51b2cecf1ee96e1e9b709234f326 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期六, 21 八月 2021 16:35:14 +0800
Subject: [PATCH] 随手拍改版接口开发
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
index eef5397..53d8f20 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
@@ -102,7 +102,7 @@
if(!comActActivityDO.getActivityAddr().equals(comActActivityVO.getActivityAddr()) || !comActActivityDO.getBeginAt().equals(comActActivityVO.getBeginAt())){
//修改活动开始时间与活动地点需要推送订阅消息给用户
ActivitySignVO activitySignVO = new ActivitySignVO();
- activitySignVO.setId(comActActivityVO.getId());
+ activitySignVO.setActivityId(comActActivityVO.getId());
List<ActivitySignVO> activitySignVOS = comActActSignDAO.listActivitySigns(activitySignVO);
if(!activitySignVOS.isEmpty()){
try {
@@ -217,19 +217,15 @@
public ComActActivityVO inforActivity(Long id, Long userId) {
ComActActivityVO comActActivityVO=comActActivityDAO.inforActivity(id);
if (!ObjectUtils.isEmpty(comActActivityVO)) {
-
- LambdaQueryWrapper<ComActActSignDO> actSignQuery = new LambdaQueryWrapper<>();
- actSignQuery.eq(ComActActSignDO::getActivityId, id);
if(userId != null){
+ LambdaQueryWrapper<ComActActSignDO> actSignQuery = new LambdaQueryWrapper<>();
+ actSignQuery.eq(ComActActSignDO::getActivityId, id);
actSignQuery.eq(ComActActSignDO::getUserId, userId);
- }
-
- ComActActSignDO comActActSignDO = comActActSignDAO.selectOne(actSignQuery);
- if (!ObjectUtils.isEmpty(comActActSignDO)) {
- comActActivityVO.setIsSign(1);
- comActActivityVO.setIsVolunteer(comActActSignDO.getIsVolunteer());
- }else {
-
+ ComActActSignDO comActActSignDO = comActActSignDAO.selectOne(actSignQuery);
+ if (!ObjectUtils.isEmpty(comActActSignDO)) {
+ comActActivityVO.setIsSign(1);
+ comActActivityVO.setIsVolunteer(comActActSignDO.getIsVolunteer());
+ }
}
}
return comActActivityVO;
@@ -535,7 +531,8 @@
public R timedTaskActivityNotice(){
//查询所有即将开始的活动
List<ComActActivityDO> actActivityList = comActActivityDAO.selectList(new QueryWrapper<ComActActivityDO>().lambda()
- .le(ComActActivityDO::getBeginAt, DateUtils.addDays(new Date(),1)));
+ .le(ComActActivityDO::getBeginAt, DateUtils.addDays(new Date(),1))
+ .ge(ComActActivityDO::getBeginAt,new Date()));
if(!actActivityList.isEmpty()){
WxXCXTempSend util = new WxXCXTempSend();
try {
--
Gitblit v1.7.1