From 67494eba4305d6e5c95079d17c5b6bcd8489df82 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期四, 09 九月 2021 10:17:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComReserveApi.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 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..ef60f1c 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,6 +4,7 @@
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.service.community.CommunityService;
@@ -56,6 +57,7 @@
@ApiOperation("取消预约/登记")
@PostMapping("/cancelReserve")
public R userCancelReserve(@RequestBody CancelRecordDTO cancelRecordDTO){
+ cancelRecordDTO.setUserId(this.getUserId());
return communityService.userCancelReserve(cancelRecordDTO);
}
@@ -68,4 +70,14 @@
comActReserveOperationRecordDO.setUserId(this.getUserId());
return communityService.reserveOperation(comActReserveOperationRecordDO);
}
+
+ @ApiOperation("预约登记列表")
+ @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