From eceb72b1b2f09a49e153e2320ede0b7b71dfb8d1 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期六, 12 十一月 2022 11:09:03 +0800
Subject: [PATCH] token获取物业id处理
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveRecordServiceImpl.java | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveRecordServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveRecordServiceImpl.java
index daa0872..137c772 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveRecordServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveRecordServiceImpl.java
@@ -7,6 +7,8 @@
import com.panzhihua.common.model.dtos.community.reserve.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.reserve.*;
+import com.panzhihua.common.model.vos.user.SysTemplateConfigVO;
+import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.common.utlis.WxUtil;
import com.panzhihua.common.utlis.WxXCXTempSend;
@@ -55,6 +57,8 @@
private ComActReserveOperationRecordService comActReserveOperationRecordService;
@Resource
private ComActActSignDAO comActActSignDAO;
+ @Resource
+ private UserService userService;
private final static String CANCEL="用户取消";
@Override
@@ -244,7 +248,7 @@
ComActReserveDO reserveDO = comActReserveMapper.selectById(reserveRecordDO.getReserveId());
// 预约以后给用户推送消息
Map<String, String> map = comActActSignDAO.getUserOpenId(reserveRecordDO.getUserId());
-
+ R<SysTemplateConfigVO> sysTemplateConfigVO=userService.selectTemplate(makeHandleDTO.getAreaCode(),10);
//判断处理是否通过
if(makeHandleDTO.getIsOk().equals(MakeHandleAdminDTO.isOk.yes)){
reserveRecordDO.setStatus(ComActReserveRecordDO.status.cg);
@@ -254,8 +258,8 @@
if (map != null) {
String openid = map.get("openid");
try {
- WxUtil.sendSubscribeYYTX(openid, util.getAppAccessToken(), "预约成功",
- reserveDO.getTitle(), reserveRecordDO.getName(), makeHandleDTO.getMakeTime());
+ WxUtil.sendSubscribeYYTX(openid, util.getAccessToken(), "预约成功",
+ reserveDO.getTitle(), reserveRecordDO.getName(), makeHandleDTO.getMakeTime(),sysTemplateConfigVO.getData().getTemplateId());
} catch (Exception e) {
log.error("消息推送失败，失败原因：" + e.getMessage());
}
@@ -269,12 +273,14 @@
if (map != null) {
String openid = map.get("openid");
try {
- WxUtil.sendSubscribeYYTX(openid, util.getAppAccessToken(), "预约失败",
- reserveDO.getTitle(), reserveRecordDO.getName(), DateUtils.format(reserveRecordDO.getReserveTime(),DateUtils.ymdhms_format));
+ WxUtil.sendSubscribeYYTX(openid, util.getAccessToken(), "预约失败",
+ reserveDO.getTitle(), reserveRecordDO.getName(), DateUtils.format(reserveRecordDO.getReserveTime(),DateUtils.ymdhms_format),sysTemplateConfigVO.getData().getTemplateId());
} catch (Exception e) {
log.error("消息推送失败，失败原因：" + e.getMessage());
}
}
+ //预约失败时需要更新预约登记参与人数
+ comActReserveMapper.addReserveCountById(reserveRecordDO.getReserveId());
}
reserveRecordDO.setActRemark(remark);
reserveRecordDO.setReserveTime(reserveTime);
@@ -321,9 +327,19 @@
registerDetailedVO.setIdentity(identity.substring(0,identity.length()-1));
//查询答题数据
List<ComActReserveRegisterDetailedAnswerVO> answerList = comActReserveAnswerContentMapper.getRegisterDetailedAnswerList(reserveRecordId);
+ answerList.forEach(answer ->{
+ if(answer.getType()==4){
+ answer.setAnswerContent(answer.getAnswerContent().replaceAll("(?<=\\w{3})\\w(?=\\w{4})", "*"));
+ }
+ });
registerDetailedVO.setAnswerList(answerList);
}
return R.ok(registerDetailedVO);
}
+ @Override
+ public R fiveCount(Long reserveId) {
+ return R.ok(comActReserveAnswerContentMapper.fiveCount(reserveId));
+ }
+
}
--
Gitblit v1.7.1