From 4e502853119c6d8e7ff686191e19bb0a19a4f875 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 04 六月 2025 16:35:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
buyer-api/src/main/java/cn/lili/controller/lmk/MyActivityController.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/buyer-api/src/main/java/cn/lili/controller/lmk/MyActivityController.java b/buyer-api/src/main/java/cn/lili/controller/lmk/MyActivityController.java
index e181ddc..723ea1c 100644
--- a/buyer-api/src/main/java/cn/lili/controller/lmk/MyActivityController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/lmk/MyActivityController.java
@@ -1,6 +1,7 @@
package cn.lili.controller.lmk;
import cn.lili.base.Result;
+import cn.lili.common.security.context.UserContext;
import cn.lili.modules.lmk.domain.query.ActivityReportQuery;
import cn.lili.modules.lmk.domain.query.MyActivityQuery;
import cn.lili.modules.lmk.service.ActivityService;
@@ -21,15 +22,13 @@
@GetMapping("/getMyActivityList")
@ApiOperation(value = "鑾峰緱鎴戠殑娲诲姩鍒楄〃", notes = "鑾峰緱鎴戠殑娲诲姩鍒楄〃")
public Result getMyActivityList(MyActivityQuery query){
-
return myActivityService.getMyActivityList(query);
}
-
- @PutMapping("/cancelActivity")
- @ApiOperation(value = "鑾峰緱鎴戠殑娲诲姩鍒楄〃", notes = "鑾峰緱鎴戠殑娲诲姩鍒楄〃")
- public Result cancelActivity(@RequestBody ActivityReportQuery query){
- return myActivityService.cancelActivity(query);
+ @PutMapping("/activityCancel/{activityId}")
+ @ApiOperation(value = "鍙栨秷娲诲姩", notes = "鍙栨秷娲诲姩")
+ public Result activityCancel(@PathVariable String activityId){
+ return myActivityService.activityCancel(activityId);
}
}
--
Gitblit v1.8.0