From 1a44a6409a672dcd30a6bcafbf177c918c6e9c68 Mon Sep 17 00:00:00 2001
From: luoyuanqiao <2376770955@qq.com>
Date: 星期二, 01 三月 2022 15:29:27 +0800
Subject: [PATCH] 随手拍、微心愿分配接口修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java | 39 ++++++++++++++++++++++-----------------
1 files changed, 22 insertions(+), 17 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 dd45bcc..0af732e 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
@@ -12,6 +12,7 @@
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Comparator;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -19,6 +20,9 @@
import javax.annotation.Resource;
+import com.panzhihua.common.model.vos.user.SysTemplateConfigVO;
+import com.panzhihua.service_community.dao.*;
+import com.panzhihua.service_community.model.dos.*;
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.data.redis.core.StringRedisTemplate;
@@ -52,19 +56,7 @@
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.WxUtil;
import com.panzhihua.common.utlis.WxXCXTempSend;
-import com.panzhihua.service_community.dao.ComActActEvaluateDAO;
-import com.panzhihua.service_community.dao.ComActActPictureDAO;
-import com.panzhihua.service_community.dao.ComActActRegistDAO;
-import com.panzhihua.service_community.dao.ComActActSignDAO;
-import com.panzhihua.service_community.dao.ComActActivityCodeDao;
-import com.panzhihua.service_community.dao.ComActActivityDAO;
-import com.panzhihua.service_community.dao.ComBpActivityDAO;
import com.panzhihua.service_community.entity.ComActActivityCode;
-import com.panzhihua.service_community.model.dos.ComActActEvaluateDO;
-import com.panzhihua.service_community.model.dos.ComActActPictureDO;
-import com.panzhihua.service_community.model.dos.ComActActRegistDO;
-import com.panzhihua.service_community.model.dos.ComActActSignDO;
-import com.panzhihua.service_community.model.dos.ComActActivityDO;
import com.panzhihua.service_community.service.ComActActivityCodeService;
import com.panzhihua.service_community.service.ComActActivityService;
import com.panzhihua.service_community.service.ComActIntegralUserTradeService;
@@ -105,6 +97,8 @@
private ComActIntegralUserTradeService comActIntegralUserTradeService;
@Resource
private ComActActivityCodeService comActActivityCodeService;
+ @Resource
+ private ComActDAO comActDAO;
/**
* 新增社区活动
@@ -186,7 +180,8 @@
try {
WxXCXTempSend util = new WxXCXTempSend();
String accessToken = util.getAppAccessToken();
-
+ ComActDO comActDO=comActDAO.selectById(comActActivityDO.getCommunityId());
+ R<SysTemplateConfigVO> r=userService.selectTemplate(comActDO.getAreaCode(),1);
activitySignVOS.forEach(activitySignVO1 -> {
// 变更社区活动推送订阅消息给用户
WxUtil.sendSubscribeHDBG(activitySignVO1.getOpenid(), accessToken,
@@ -196,7 +191,7 @@
comActActivityDO.getActivityAddr(),
com.panzhihua.common.utlis.DateUtils.format(comActActivityVO.getBeginAt(),
com.panzhihua.common.utlis.DateUtils.ymdhms_format),
- comActActivityVO.getActivityAddr());
+ comActActivityVO.getActivityAddr(),r.getData().getTemplateId());
});
} catch (Exception e) {
log.error("消息推送失败，失败原因：" + e.getMessage());
@@ -316,6 +311,12 @@
if (!ObjectUtils.isEmpty(comActActSignDO)) {
comActActivityVO.setIsSign(1);
comActActivityVO.setIsVolunteer(comActActSignDO.getIsVolunteer());
+ }
+ List<ComActActRegistDO> regList = comActActRegistDAO.selectList(new QueryWrapper<ComActActRegistDO>().lambda()
+ .eq(ComActActRegistDO::getUserId, userId).eq(ComActActRegistDO::getActivityId, id).eq(ComActActRegistDO::getType, 1));
+ if (!regList.isEmpty()) {
+ List<ComActActRegistDO> collect = regList.stream().sorted(Comparator.comparing(ComActActRegistDO::getId).reversed()).collect(Collectors.toList());
+ comActActivityVO.setTimes(collect.get(0).getTimes());
}
}
}
@@ -477,6 +478,7 @@
return R.fail("已经报名过了，请勿重复提交");
}
Integer volunteerMax = actActivityDO.getVolunteerMax();
+ Integer activityType = actActivityDO.getType();
Integer residentMax = actActivityDO.getParticipantMax();
R<LoginUserInfoVO> userInfoR = userService.getUserInfoByUserId(String.valueOf(userId));
LoginUserInfoVO loginUserInfoVO =
@@ -484,7 +486,7 @@
// 查询当前活动下参与居民
Integer residentCount = comActActSignDAO.selectCount(new QueryWrapper<ComActActSignDO>().lambda()
.eq(ComActActSignDO::getActivityId, activityId).eq(ComActActSignDO::getIsVolunteer, 0).eq(ComActActSignDO::getStatus, 1));
- if (volunteerMax != 0) {
+ if (activityType.equals(2)) {
//志愿者活动
boolean userIsVolunteer = loginUserInfoVO.getIsVolunteer() == 1;
// 查询当前活动下参与志愿者
@@ -597,7 +599,7 @@
public R listActivity(Long userId, Integer status) {
List<ActivitySignVO> activitySignVOList = comActActSignDAO.selectList(userId);
if (ObjectUtils.isEmpty(activitySignVOList)) {
- return R.fail();
+ return R.ok();
}
List<Long> longs = activitySignVOList.stream().map(activitySignVO -> activitySignVO.getActivityId())
.collect(Collectors.toList());
@@ -844,6 +846,8 @@
try {
String accessToken = util.getAppAccessToken();
actActivityList.forEach(actActivity -> {
+ ComActDO comActDO=comActDAO.selectById(actActivity.getCommunityId());
+ R<SysTemplateConfigVO> r=userService.selectTemplate(comActDO.getAreaCode(),9);
// 查询报名活动人员列表
List<ComActActSignDO> actSignList = comActActSignDAO.selectList(new QueryWrapper<ComActActSignDO>()
.lambda().eq(ComActActSignDO::getActivityId, actActivity.getId()));
@@ -851,12 +855,13 @@
// 查询用户openId
Map<String, String> map = comActActSignDAO.getUserOpenId(actSign.getUserId());
if (map != null) {
+
String openid = map.get("openid");
// 推送消息
WxUtil.sendSubscribeHDJJKS(openid, accessToken, actActivity.getActivityName(),
com.panzhihua.common.utlis.DateUtils.format(actActivity.getBeginAt(),
com.panzhihua.common.utlis.DateUtils.ymdhms_format),
- actActivity.getActivityAddr(), actSignList.size() + "");
+ actActivity.getActivityAddr(), actSignList.size() + "",r.getData().getTemplateId());
}
});
--
Gitblit v1.7.1