From ea6b0efbfd58ab4a2f0a7c9f504688e7f4e12102 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 30 八月 2021 16:29:06 +0800
Subject: [PATCH] Merge branch 'test' into zzj
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveServiceImpl.java | 59 +++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 39 insertions(+), 20 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveServiceImpl.java
index abcafac..7ff9f0f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveServiceImpl.java
@@ -83,6 +83,14 @@
ComActReserveDO comActReserveDO=comActReserveMapper.selectById(comActReserveCommitVO.getId());
if(comActReserveDO!=null){
//查询当前用户是否已预约并判断是否能继续预约
+ if(comActReserveDO.getJoinAllCount()!=0){
+ Integer count=comActReserveRecordMapper.selectCount(new QueryWrapper<ComActReserveRecordDO>().eq("reserve_id",comActReserveCommitVO.getId()));
+ if(count>=comActReserveDO.getJoinCount()){
+ return R.fail("预约已上限");
+ }
+ }
+
+
List<ComActReserveRecordDO> list=comActReserveRecordMapper.selectList(new QueryWrapper<ComActReserveRecordDO>().eq("reserve_id",comActReserveCommitVO.getId()).eq("user_id",comActReserveCommitVO.getUserId()).in("status",1,2,3));
if(!list.isEmpty()&&list.size()>1&&comActReserveDO.getIsRepeat()==ComActReserveDO.isRepeat.no){
return R.fail("提交失败，不可重复预约");
@@ -167,6 +175,7 @@
comActReserveMapper.updateById(comActReserveDO);
//新增用户答题记录
ComActReserveRecordDO userAnswerDO = new ComActReserveRecordDO();
+ userAnswerDO.setCommunityId(comActReserveCommitVO.getCommunityId());
userAnswerDO.setPhone(comActReserveCommitVO.getPhone());
userAnswerDO.setReserveId(questId);
userAnswerDO.setReserveTime(comActReserveCommitVO.getReserveTime());
@@ -548,31 +557,41 @@
}
@Override
- public R getById(Long id,Long userId,Long recordId) {
+ public R getById(Long id,Long userId,Long recordId,Integer isBack) {
ComActReserveDO comActReserveDO=comActReserveMapper.selectById(id);
if(comActReserveDO!=null){
comActReserveDO.setViewNum(comActReserveDO.getViewNum()+1);
ComActReserveDetailVO comActReserveDetailVO=new ComActReserveDetailVO();
- BeanUtils.copyProperties(comActReserveDO,comActReserveDetailVO);
- List<ComActReserveRecordDO> list=comActReserveRecordMapper.selectList(new QueryWrapper<ComActReserveRecordDO>().eq("user_id",userId).eq("reserve_id",id).in("status",1,2).orderByDesc("reserve_time"));
- List<ComActReserveRecordDO> secondlist=comActReserveRecordMapper.selectList(new QueryWrapper<ComActReserveRecordDO>().eq("user_id",userId).eq("reserve_id",id).orderByDesc("reserve_time"));
- //判断当前数据是否可重复提交
- if(comActReserveDO.getIsRepeat()==ComActReserveDetailVO.isOk.y||list.isEmpty()){
- comActReserveDetailVO.setIsOk(ComActReserveDetailVO.isOk.n);
- }else {
- comActReserveDetailVO.setIsOk(ComActReserveDetailVO.isOk.y);
+ if(isBack!=1){
+ comActReserveDO.setViewNum(comActReserveDO.getViewNum()+1);
+ BeanUtils.copyProperties(comActReserveDO,comActReserveDetailVO);
+ List<ComActReserveRecordDO> list=comActReserveRecordMapper.selectList(new QueryWrapper<ComActReserveRecordDO>().eq("user_id",userId).eq("reserve_id",id).in("status",1,2).orderByDesc("reserve_time"));
+ List<ComActReserveRecordDO> secondlist=comActReserveRecordMapper.selectList(new QueryWrapper<ComActReserveRecordDO>().eq("user_id",userId).eq("reserve_id",id).orderByDesc("reserve_time"));
+ //判断当前数据是否可重复提交
+ if(comActReserveDO.getIsRepeat()==ComActReserveDetailVO.isOk.y||list.isEmpty()){
+ comActReserveDetailVO.setIsOk(ComActReserveDetailVO.isOk.n);
+ }else {
+ comActReserveDetailVO.setIsOk(ComActReserveDetailVO.isOk.y);
+ }
+ //如果用户已提交返回最新一条记录 列表时间倒序排列
+ if(!list.isEmpty()){
+ comActReserveDetailVO.setJsonObject(list.get(0).getJsonObject());
+ comActReserveDetailVO.setReserveTime(list.get(0).getReserveTime());
+ }
+ if(!secondlist.isEmpty()&&recordId!=null){
+ secondlist.forEach(comActReserveRecordDO -> {
+ if(comActReserveRecordDO.getId().equals(recordId)){
+ comActReserveDetailVO.setRecordStatus(comActReserveRecordDO.getStatus());
+ }
+ });
+ }
+ //更新浏览量
+ comActReserveMapper.updateById(comActReserveDO);
+ return R.ok(comActReserveDetailVO);
}
- //如果用户已提交返回最新一条记录 列表时间倒序排列
- if(!list.isEmpty()){
- comActReserveDetailVO.setJsonObject(list.get(0).getJsonObject());
- comActReserveDetailVO.setReserveTime(list.get(0).getReserveTime());
- }
- if(!secondlist.isEmpty()&&recordId!=null){
- secondlist.forEach(comActReserveRecordDO -> {
- if(comActReserveRecordDO.getId().equals(recordId)){
- comActReserveDetailVO.setRecordStatus(comActReserveRecordDO.getStatus());
- }
- });
+ ComActReserveRecordDO comActReserveRecordDO =comActReserveRecordMapper.selectById(recordId);
+ if(comActReserveRecordDO!=null){
+ BeanUtils.copyProperties(comActReserveRecordDO,comActReserveDetailVO);
}
//更新浏览量
comActReserveMapper.updateById(comActReserveDO);
--
Gitblit v1.7.1