From 6fc1e7f179acaeec4df755f72895b3b4fb50d4bb Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 14 一月 2022 13:15:59 +0800
Subject: [PATCH] Merge branch 'renhequ' into dev
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
index 37a3604..9a023bc 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
@@ -2,6 +2,8 @@
import static java.util.stream.Collectors.toList;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.Date;
@@ -12,6 +14,7 @@
import javax.annotation.Resource;
import com.panzhihua.common.model.vos.community.ComActActivityTypeVO;
+import com.panzhihua.common.model.vos.user.SysTemplateConfigVO;
import com.panzhihua.service_community.dao.ComActActEvaluateDAO;
import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.service_community.service.*;
@@ -362,6 +365,23 @@
comActActivityVO.setComActActEvaluateVOList(comActActEvaluatePage.getRecords());
//活动评价总数
comActActivityVO.setEvaluateAmount(comActActEvaluatePage.getTotal());
+ List<ComActActEvaluateDO> comActActEvaluateList = comActActEvaluateDAO
+ .selectList(new QueryWrapper<ComActActEvaluateDO>().lambda().eq(ComActActEvaluateDO::getActivityId, id));
+ if (comActActEvaluateList != null && comActActEvaluateList.size() > 0) {
+ BigDecimal starNum = BigDecimal.ZERO;
+ //总星级
+ for (ComActActEvaluateDO evaluate:comActActEvaluateList) {
+ starNum = starNum.add(BigDecimal.valueOf(evaluate.getStarLevel()==null?0:evaluate.getStarLevel()));
+ }
+ //评分星级(如果无评分默认5分)=总星级/总评价人数
+ if(starNum.compareTo(BigDecimal.ZERO) == 0){
+ comActActivityVO.setEvaluateLevel(BigDecimal.valueOf(5));
+ }else{
+ comActActivityVO.setEvaluateLevel(starNum.divide(BigDecimal.valueOf(comActActEvaluateList.size()),2, RoundingMode.HALF_UP));
+ }
+ }else{
+ comActActivityVO.setEvaluateLevel(BigDecimal.valueOf(5));
+ }
//当前用户对活动的评分
ComActActEvaluateVO userActEvaluateVO = comActActEvaluateDAO.getEvaluateListByUserId(id,userId);
if(userActEvaluateVO != null){
@@ -381,6 +401,7 @@
//活动报名名单
ActivitySignVO activitySignVO = new ActivitySignVO();
activitySignVO.setActivityId(activityId);
+ activitySignVO.setStatus(1);
R r = comActActivityService.listActivitySigns(activitySignVO);
if (R.isOk(r)) {
List<ActivitySignVO> activitySignVOS =
@@ -1495,8 +1516,8 @@
* @return 社区集合 按照创建顺序倒序排列
*/
@PostMapping("listcommunityall")
- public R listCommunityAll() {
- return comActService.listCommunityAll();
+ public R listCommunityAll(@RequestParam("areaCode") String areaCode) {
+ return comActService.listCommunityAll(areaCode);
}
/**
@@ -2220,10 +2241,11 @@
String openid = map.get("openid");
try {
WxXCXTempSend util = new WxXCXTempSend();
+ R<SysTemplateConfigVO> sysTemplateConfigVO=userService.selectTemplate(eldersAuthFeedbackAddDTO.getAreaCode(),5);
String accessToken = util.getAppAccessToken();
WxUtil.sendSubscribeRZSH(openid, accessToken, "高龄认证",
DateUtils.format(eldersAuthDO.getCreateAt(), DateUtils.ymdhms_format),
- eldersAuthFeedbackAddDTO.getFeedBack());
+ eldersAuthFeedbackAddDTO.getFeedBack(),sysTemplateConfigVO.getData().getTemplateId());
} catch (Exception e) {
log.error("推送审核状态订阅消息失败，失败原因：" + e.getMessage());
}
@@ -2295,8 +2317,8 @@
* @return 社区列表
*/
@GetMapping("/eventgrid/community/westList")
- public R getWestCommunityLists() {
- return comActService.getWestCommunityLists();
+ public R getWestCommunityLists(String areaCode) {
+ return comActService.getWestCommunityLists(areaCode);
}
/**
--
Gitblit v1.7.1