From 1fdfb56613adca09a0ddf39289b41f96fa335a01 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期三, 23 七月 2025 17:55:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
buyer-api/src/main/java/cn/lili/controller/lmk/MyActivityController.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 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 723ea1c..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
@@ -2,6 +2,8 @@
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;
@@ -19,6 +21,8 @@
@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){
@@ -26,9 +30,22 @@
}
+
@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