From 1775bb71f952106c58657cf02891cbe2a286c8f8 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 22 九月 2021 11:30:47 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComReserveApi.java | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComReserveApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComReserveApi.java
index 4d5a12b..a21f673 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComReserveApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComReserveApi.java
@@ -4,8 +4,13 @@
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.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActReserveCommitVO;
+import com.panzhihua.common.model.vos.community.ComActReserveIndexVo;
+import com.panzhihua.common.model.vos.community.reserve.ComActReserveAppletsVO;
+import com.panzhihua.common.model.vos.community.reserve.ComActReserveDetailVO;
+import com.panzhihua.common.model.vos.community.reserve.ComOperationDetailVO;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -25,7 +30,7 @@
@Resource
private CommunityService communityService;
- @ApiOperation("详情")
+ @ApiOperation(value = "详情",response = ComActReserveDetailVO.class)
@GetMapping("/detail")
public R detail(@RequestParam("id") Long id,@RequestParam("recordId") Long recordId,@RequestParam("isBack") Integer isBack){
return communityService.reserveDetail(id,this.getUserId(),recordId,isBack);
@@ -44,7 +49,7 @@
* @param pageUserReserveDTO
* @return
*/
- @ApiOperation("我的预约/登记")
+ @ApiOperation(value = "我的预约/登记",response = ComActReserveAppletsVO.class)
@PostMapping("/userReserveList")
public R userReserveList(@RequestBody PageUserReserveDTO pageUserReserveDTO){
pageUserReserveDTO.setUserId(this.getUserId());
@@ -56,16 +61,27 @@
@ApiOperation("取消预约/登记")
@PostMapping("/cancelReserve")
public R userCancelReserve(@RequestBody CancelRecordDTO cancelRecordDTO){
+ cancelRecordDTO.setUserId(this.getUserId());
return communityService.userCancelReserve(cancelRecordDTO);
}
/**
* 预约详情操作记录
*/
- @ApiOperation("预约详情操作记录")
+ @ApiOperation(value = "预约详情操作记录",response = ComOperationDetailVO.class)
@PostMapping("/detailOperation")
public R reserveOperation(@RequestBody OperationDetailDTO comActReserveOperationRecordDO){
comActReserveOperationRecordDO.setUserId(this.getUserId());
return communityService.reserveOperation(comActReserveOperationRecordDO);
}
+
+ @ApiOperation(value = "预约登记列表",response = ComActReserveIndexVo.class)
+ @GetMapping("/list")
+ public R list(@RequestParam("communityId") Long communityId){
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if(loginUserInfo != null){
+ communityId = loginUserInfo.getCommunityId();
+ }
+ return communityService.reserveListApplets(communityId);
+ }
}
--
Gitblit v1.7.1