From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 10:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveRecordServiceImpl.java | 20 +++++++++++++++-----
1 files changed, 15 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 a128e4c..d8aab2a 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
@@ -8,12 +8,11 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.reserve.*;
import com.panzhihua.common.utlis.DateUtils;
-import com.panzhihua.service_community.dao.ComActReserveAnswerContentMapper;
-import com.panzhihua.service_community.dao.ComActReserveOperationRecordMapper;
+import com.panzhihua.service_community.dao.*;
import com.panzhihua.common.model.dtos.community.CancelRecordDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.dao.ComActReserveOperationRecordMapper;
-import com.panzhihua.service_community.dao.ComActReserveRecordMapper;
+import com.panzhihua.service_community.model.dos.ComActReserveDO;
import com.panzhihua.service_community.model.dos.ComActReserveOperationRecordDO;
import com.panzhihua.service_community.model.dos.ComActReserveRecordDO;
import com.panzhihua.service_community.service.ComActReserveOperationRecordService;
@@ -43,6 +42,8 @@
@Resource
private ComActReserveRecordMapper comActReserveRecordMapper;
@Resource
+ private ComActReserveMapper comActReserveMapper;
+ @Resource
private ComActReserveAnswerContentMapper comActReserveAnswerContentMapper;
@Resource
private ComActReserveOperationRecordMapper comActReserveOperationRecordMapper;
@@ -58,10 +59,16 @@
ComActReserveRecordDO comActReserveRecordDO=comActReserveRecordMapper.selectById(comActReserveRecord.getId());
if(comActReserveRecordDO!=null&&comActReserveRecordDO.getStatus()!=ComActReserveRecordDO.status.yqx){
comActReserveRecordDO.setStatus(ComActReserveRecordDO.status.yqx);
- comActReserveRecordDO.setContent(comActReserveRecord.getContent());
+ comActReserveRecordDO.setRemark(comActReserveRecord.getContent());
+ comActReserveRecordDO.setReserveTime(DateUtil.date());
int result =comActReserveRecordMapper.updateById(comActReserveRecordDO);
//判断取消状态并添加操作记录
if(result>0){
+ //更新回答用户数量
+ ComActReserveDO comActReserveDO=comActReserveMapper.selectById(comActReserveRecordDO.getReserveId());
+ Integer joinCount = comActReserveDO.getJoinCount();
+ comActReserveDO.setJoinCount(joinCount != null ? joinCount - 1 : 0);
+ comActReserveMapper.updateById(comActReserveDO);
ComActReserveOperationRecordDO comActReserveOperationRecordDO=new ComActReserveOperationRecordDO();
comActReserveOperationRecordDO.setReserveId(comActReserveRecordDO.getReserveId());
comActReserveOperationRecordDO.setReserveRecordId(comActReserveRecordDO.getId());
@@ -71,6 +78,7 @@
comActReserveOperationRecordDO.setPhone(comActReserveRecordDO.getPhone());
comActReserveOperationRecordDO.setStatus(ComActReserveOperationRecordDO.status.qx);
comActReserveOperationRecordDO.setUserId(comActReserveRecordDO.getUserId());
+ comActReserveOperationRecordDO.setReserveTime(DateUtil.date());
comActReserveOperationRecordMapper.insert(comActReserveOperationRecordDO);
return R.ok();
}
@@ -118,13 +126,15 @@
public R makeCancelAdmin(CancelReserveRecordDTO reserveRecordDTO){
Integer count = this.baseMapper.getReserveStatusById(reserveRecordDTO.getIds());
if(count > 0){
- return R.ok("您选择的记录中存在未预约成功，不可进行批量取消");
+ return R.fail("仅预约成功的可以进行取消操作");
}
if(this.baseMapper.editReserveStatusById(reserveRecordDTO.getIds()) > 0){
Long userId = reserveRecordDTO.getUserId();
reserveRecordDTO.getIds().forEach(id -> {
ComActReserveRecordDO reserveRecordDO = comActReserveRecordMapper.selectById(id);
if(reserveRecordDO != null){
+ //取消预约返还可参加名额
+ comActReserveMapper.addReserveCountById(reserveRecordDO.getReserveId());
//添加操作记录
comActReserveOperationRecordService.addReserveOperationRecord(reserveRecordDO.getReserveId()
,reserveRecordDO.getId(),reserveRecordDO.getUserId(),ComActReserveOperationRecordDO.type.sq,null
--
Gitblit v1.7.1