From e8a0fd29e22c43c2146ffae0564ff03cbf0fc2c4 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 14 十月 2025 09:57:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/InternalWebController.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/InternalWebController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/InternalWebController.java
index bff4abf..c7f6ecf 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/InternalWebController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/InternalWebController.java
@@ -1,9 +1,11 @@
package com.doumee.cloud.web;
import com.doumee.api.BaseController;
+import com.doumee.config.annotation.CloudRequiredPermission;
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
@@ -33,7 +35,7 @@
@RestController
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/web/member")
@Slf4j
-@LoginNoRequired
+//@LoginNoRequired
public class InternalWebController extends BaseController {
@Autowired
@@ -90,4 +92,19 @@
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
+ /**
+ * 2025-3-25 14:14:34 鍔犲叆鍙栨秷棰勭害 寰呭鎵广�佸鎵逛腑銆佸凡瀹℃壒
+ * @param visitId
+ * @param token
+ * @return
+ */
+ @ApiOperation("鍙栨秷棰勭害")
+ @GetMapping("/visitsCancel")
+// @CloudRequiredPermission("business:visits:cancel")
+ public ApiResponse visitsCancel(@RequestParam Integer visitId,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ LoginUserInfo loginUserInfo = getLoginUser(token);
+ visitsService.visitsCancel(visitId,loginUserInfo);
+ return ApiResponse.success(null);
+ }
+
}
--
Gitblit v1.9.3