From ab95fdd0d06f409b4f41ff9696f292248e86d9bc Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 14 七月 2025 10:36:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
buyer-api/src/main/java/cn/lili/controller/lmk/MyActivityController.java | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 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..65ce1f4 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,9 @@
package cn.lili.controller.lmk;
import cn.lili.base.Result;
+import cn.lili.common.security.context.UserContext;
+import cn.lili.modules.lmk.domain.form.ActivityForm;
+import cn.lili.modules.lmk.domain.query.ActivityQuery;
import cn.lili.modules.lmk.domain.query.ActivityReportQuery;
import cn.lili.modules.lmk.domain.query.MyActivityQuery;
import cn.lili.modules.lmk.service.ActivityService;
@@ -18,18 +21,31 @@
@RequestMapping("/buyer/lmk/my-activity")
public class MyActivityController {
private final MyActivityService myActivityService;
+
+ private final ActivityService activityService;
@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);
}
+ @PostMapping("/add")
+ @ApiOperation(value = "鍟嗘埛绔柊澧炴椿鍔�", notes = "鍟嗘埛绔柊澧炴椿鍔�")
+ public Result addActivityByBuyer(@RequestBody ActivityForm form){
+ return activityService.add(form,false);
+ }
+
+ @GetMapping("/applyActivityPage")
+ @ApiOperation(value = "鐢ㄦ埛鐢宠娲诲姩鍒嗛〉", notes = "鐢ㄦ埛鐢宠娲诲姩鍒嗛〉")
+ public Result getMyApplyActivityPage(ActivityQuery query){
+ return activityService.getMyApplyActivityPage(query);
+ }
+
}
--
Gitblit v1.8.0