From 702a936a613cc16d1aeb0b2326cd795e0e8ecefd Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 21 五月 2025 14:41:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java
index a27e759..d405af2 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java
@@ -75,13 +75,13 @@
visitsService.updateById(visits);
return ApiResponse.success(null);
}
- @ApiOperation("鎵嬪姩绛剧")
- @GetMapping("/visitCancel")
- @CloudRequiredPermission("business:visits:cancel")
- public ApiResponse visitCancel(@RequestParam Integer visitId,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
- visitsService.visitCancel(visitId);
- return ApiResponse.success(null);
- }
+// @ApiOperation("鎵嬪姩绛剧")
+// @GetMapping("/visitCancel")
+// @CloudRequiredPermission("business:visits:cancel")
+// public ApiResponse visitCancel(@RequestParam Integer visitId,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+// visitsService.visitCancel(visitId);
+// return ApiResponse.success(null);
+// }
/**
@@ -92,9 +92,10 @@
*/
@ApiOperation("鍙栨秷棰勭害")
@GetMapping("/visitsCancel")
- @CloudRequiredPermission("business:visits:cancel")
+// @CloudRequiredPermission("business:visits:cancel")
public ApiResponse visitsCancel(@RequestParam Integer visitId,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
- visitsService.visitsCancel(visitId);
+ LoginUserInfo loginUserInfo = getLoginUser(token);
+ visitsService.visitsCancel(visitId,loginUserInfo);
return ApiResponse.success(null);
}
--
Gitblit v1.9.3