springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActReserveMapper.java
@@ -25,7 +25,17 @@ */ @Mapper public interface ComActReserveMapper extends BaseMapper<ComActReserveDO> { /** * 查询预约登记首页banner * @param communityId * @return 预约登记首页banner列表 */ List<ComActReserveIndexVo> indexBanner(Long communityId); /** * 查询预约登记应用列表 * @param communityId * @return 预约登记应用列表 */ List<ComActReserveIndexVo> indexApplication(Long communityId); /** springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActReserveService.java
@@ -14,7 +14,18 @@ * @describe 预约登记表服务类 */ public interface ComActReserveService extends IService<ComActReserveDO> { /** * 小程序提交预约登记 * @param comActReserveCommitVO * @return 预约登记结果 */ R commit(ComActReserveCommitVO comActReserveCommitVO); /** * 小程序我的预约登记 * @param pageUserReserveDTO * @return 预约登记列表 */ R pageReserveList(PageUserReserveDTO pageUserReserveDTO); /** springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveRecordServiceImpl.java
@@ -53,11 +53,13 @@ @Transactional public R cancel(CancelRecordDTO comActReserveRecord) { if(comActReserveRecord!=null&&comActReserveRecord.getId()!=null){ //查询当前操作数据并判断取消状态 ComActReserveRecordDO comActReserveRecordDO=comActReserveRecordMapper.selectById(comActReserveRecord.getId()); if(comActReserveRecordDO!=null&&comActReserveRecordDO.getStatus()!=ComActReserveRecordDO.status.yqx){ comActReserveRecordDO.setStatus(ComActReserveRecordDO.status.yqx); comActReserveRecordDO.setContent(comActReserveRecord.getContent()); int result =comActReserveRecordMapper.updateById(comActReserveRecordDO); //判断取消状态并添加操作记录 if(result>0){ ComActReserveOperationRecordDO comActReserveOperationRecordDO=new ComActReserveOperationRecordDO(); comActReserveOperationRecordDO.setReserveId(comActReserveRecordDO.getReserveId()); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveServiceImpl.java
@@ -76,8 +76,10 @@ if(comActReserveCommitVO!=null){ Long userId=comActReserveCommitVO.getUserId(); Date nowDate=DateUtil.date(); //查询预约登记记录 ComActReserveDO comActReserveDO=comActReserveMapper.selectById(comActReserveCommitVO.getId()); if(comActReserveDO!=null){ //查询当前用户是否已预约并判断是否能继续预约 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()&&comActReserveDO.getIsRepeat()==ComActReserveDO.isRepeat.no){ return R.fail("提交失败,不可重复预约");