From e07954a546656eaea6dfbd541e99537a846d0588 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期五, 25 二月 2022 11:25:54 +0800
Subject: [PATCH] 五微服务增加核实不通过
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java | 63 +++++++++++++++----------------
1 files changed, 30 insertions(+), 33 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..c827325 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
@@ -10,11 +10,7 @@
import java.text.DecimalFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
import javax.annotation.Resource;
@@ -38,33 +34,15 @@
import com.panzhihua.common.model.vos.IndexDataVO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.community.ActivitySignVO;
-import com.panzhihua.common.model.vos.community.ComActActEvaluateVO;
-import com.panzhihua.common.model.vos.community.ComActActPictureVO;
-import com.panzhihua.common.model.vos.community.ComActActRegistVO;
-import com.panzhihua.common.model.vos.community.ComActActivityStatisticsVO;
-import com.panzhihua.common.model.vos.community.ComActActivityTypeVO;
-import com.panzhihua.common.model.vos.community.ComActActivityVO;
-import com.panzhihua.common.model.vos.community.CommunityActivitiesVO;
-import com.panzhihua.common.model.vos.community.CommunityGovernanceTrendsVO;
-import com.panzhihua.common.model.vos.community.SignactivityVO;
+import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.community.screen.work.ActActivityListVO;
+import com.panzhihua.common.model.vos.user.SysTemplateConfigVO;
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.dao.*;
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.model.dos.*;
import com.panzhihua.service_community.service.ComActActivityCodeService;
import com.panzhihua.service_community.service.ComActActivityService;
import com.panzhihua.service_community.service.ComActIntegralUserTradeService;
@@ -105,6 +83,8 @@
private ComActIntegralUserTradeService comActIntegralUserTradeService;
@Resource
private ComActActivityCodeService comActActivityCodeService;
+ @Resource
+ private ComActDAO comActDAO;
/**
* 新增社区活动
@@ -135,7 +115,9 @@
comActActivityDO.setStatus(3);
}
}
-
+ if(comActActivityVO.getType()==4){
+ comActActivityDO.setIsProject(1);
+ }
boolean save = this.save(comActActivityDO);
if (!save) {
return R.fail();
@@ -156,7 +138,7 @@
ComActActivityCode comActActivityCode = new ComActActivityCode();
comActActivityCode.setActivityId(comActActivityDO.getId().longValue());
comActActivityCode.setCreateTime(new Date());
- comActActivityCode.setType(1);
+ comActActivityCode.setType(comActActivityVO.getType());
comActActivityCode.setStatus(1);
comActActivityCodeService.save(comActActivityCode);
return R.ok(activityId);
@@ -186,7 +168,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 +179,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 +299,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());
}
}
}
@@ -597,7 +586,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 +833,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 +842,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());
}
});
@@ -1083,4 +1075,9 @@
}
return R.ok();
}
+
+ @Override
+ public String getActBelongRegionCode(Long communityId) {
+ return baseMapper.getActBelongRegionCode(communityId);
+ }
}
--
Gitblit v1.7.1