From 06650302163e395c038b37a10d5c4214ba9cc8a9 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期二, 31 八月 2021 10:24:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveServiceImpl.java | 6 +++++-
1 files changed, 5 insertions(+), 1 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 b37d37a..c5957c9 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
@@ -85,7 +85,7 @@
//查询当前用户是否已预约并判断是否能继续预约
if(comActReserveDO.getJoinAllCount()!=0){
Integer count=comActReserveRecordMapper.selectCount(new QueryWrapper<ComActReserveRecordDO>().eq("reserve_id",comActReserveCommitVO.getId()));
- if(count>=comActReserveDO.getJoinCount()){
+ if(count>=comActReserveDO.getJoinAllCount()){
return R.fail("预约已上限");
}
}
@@ -175,6 +175,7 @@
comActReserveMapper.updateById(comActReserveDO);
//新增用户答题记录
ComActReserveRecordDO userAnswerDO = new ComActReserveRecordDO();
+ userAnswerDO.setName(comActReserveCommitVO.getName());
userAnswerDO.setCommunityId(comActReserveCommitVO.getCommunityId());
userAnswerDO.setPhone(comActReserveCommitVO.getPhone());
userAnswerDO.setReserveId(questId);
@@ -562,6 +563,7 @@
if(comActReserveDO!=null){
ComActReserveDetailVO comActReserveDetailVO=new ComActReserveDetailVO();
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"));
@@ -583,6 +585,8 @@
}
});
}
+ //更新浏览量
+ comActReserveMapper.updateById(comActReserveDO);
return R.ok(comActReserveDetailVO);
}
ComActReserveRecordDO comActReserveRecordDO =comActReserveRecordMapper.selectById(recordId);
--
Gitblit v1.7.1