From 7731909887d754eafec31e003ddc4fca71e9eb24 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 26 八月 2021 09:38:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActReserveApi.java | 76 +++++++++++++++++++++++++++++++++++++-
1 files changed, 74 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActReserveApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActReserveApi.java
index 88154d4..de75ba2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActReserveApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActReserveApi.java
@@ -1,9 +1,19 @@
package com.panzhihua.service_community.api;
-import com.panzhihua.common.model.dtos.community.reserve.*;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.panzhihua.common.model.dtos.community.CancelRecordDTO;
+import com.panzhihua.common.model.dtos.community.OperationDetailDTO;
+import com.panzhihua.common.model.dtos.community.PageUserReserveDTO;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.service_community.service.ComActReserveAnswerContentService;
+import com.panzhihua.common.model.vos.community.ComActReserveCommitVO;
+import com.panzhihua.service_community.dao.ComActReserveOperationRecordMapper;
+import com.panzhihua.service_community.model.dos.ComActReserveOperationRecordDO;
+import com.panzhihua.service_community.model.dos.ComActReserveRecordDO;
+import com.panzhihua.service_community.service.ComActReserveOperationRecordService;
import com.panzhihua.service_community.service.ComActReserveRecordService;
+import com.panzhihua.common.model.dtos.community.reserve.*;
+import com.panzhihua.service_community.service.ComActReserveAnswerContentService;
import com.panzhihua.service_community.service.ComActReserveService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
@@ -25,6 +35,8 @@
private ComActReserveRecordService comActReserveRecordService;
@Resource
private ComActReserveAnswerContentService comActReserveAnswerContentService;
+ @Resource
+ private ComActReserveOperationRecordService comActReserveOperationRecordService;
/**
* 社区后台-分页查询预约登记列表
@@ -86,6 +98,28 @@
return comActReserveService.detailReserveAdmin(reserveId);
}
+ /**
+ * 预约登记详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/detail")
+ public R detail(@RequestParam("id") Long id){
+ if(id!=null){
+ return R.ok(comActReserveService.getById(id));
+ }
+ return R.fail();
+ }
+
+ /**
+ * 小程序提交预约/登记
+ * @param comActReserveCommitVO
+ * @return
+ */
+ @PostMapping("/commit")
+ public R commit(@RequestBody ComActReserveCommitVO comActReserveCommitVO){
+ return comActReserveService.commit(comActReserveCommitVO);
+ }
/**
* 社区后台-根据社区id统计预约类数据
* @param makeStatisticsDTO 请求参数
@@ -221,4 +255,42 @@
return comActReserveAnswerContentService.exportRegisterAdmin(reserveId);
}
+ /**
+ * 我的预约/登记
+ * @param pageUserReserveDTO
+ * @return
+ */
+ @PostMapping("/userReserveList")
+ public R userReserveList(@RequestBody PageUserReserveDTO pageUserReserveDTO){
+ return comActReserveService.pageReserveList(pageUserReserveDTO);
+ }
+ /**
+ * 取消预约/登记
+ */
+ @PostMapping("/cancelReserve")
+ public R userCancelReserve(@RequestBody CancelRecordDTO cancelRecordDTO){
+ return comActReserveRecordService.cancel(cancelRecordDTO);
+ }
+
+ /**
+ * 预约详情操作记录
+ */
+ @PostMapping("/detailOperation")
+ public R reserveOperation(@RequestBody OperationDetailDTO comActReserveOperationRecordDO){
+ if(comActReserveOperationRecordDO!=null){
+ QueryWrapper<ComActReserveOperationRecordDO> queryWrapper=new QueryWrapper<>();
+ if(comActReserveOperationRecordDO.getUserId()!=null){
+ queryWrapper.eq("user_id",comActReserveOperationRecordDO.getUserId());
+ }
+ if(comActReserveOperationRecordDO.getReserveRecordId()!=null){
+ queryWrapper.eq("reserve_record_id",comActReserveOperationRecordDO.getReserveRecordId());
+ }
+ if(comActReserveOperationRecordDO.getType()!=null){
+ queryWrapper.eq("type",comActReserveOperationRecordDO.getType());
+ }
+ queryWrapper.orderByDesc("reserve_time");
+ return R.ok(comActReserveOperationRecordService.list(queryWrapper));
+ }
+ return R.ok();
+ }
}
--
Gitblit v1.7.1