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/ActivityReportController.java | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/buyer-api/src/main/java/cn/lili/controller/lmk/ActivityReportController.java b/buyer-api/src/main/java/cn/lili/controller/lmk/ActivityReportController.java new file mode 100644 index 0000000..ff0bac3 --- /dev/null +++ b/buyer-api/src/main/java/cn/lili/controller/lmk/ActivityReportController.java @@ -0,0 +1,43 @@ +package cn.lili.controller.lmk; + +import cn.lili.base.Result; +import cn.lili.common.security.context.UserContext; +import cn.lili.modules.lmk.domain.form.ActivityReportForm; +import cn.lili.modules.lmk.service.ActivityService; +import cn.lili.modules.lmk.service.MyActivityService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +@Validated +@RequiredArgsConstructor +@Api(value = "灏忕▼搴忕娲诲姩绠$悊", tags = "灏忕▼搴忕娲诲姩绠$悊") +@RestController +@RequestMapping("/buyer/lmk/activityReport") +public class ActivityReportController { + + private final ActivityService activityService; + + private final MyActivityService myActivityService; + + @GetMapping() + @ApiOperation(value = "娲诲姩鍒楄〃", notes = "娲诲姩鍒楄〃") + public Result getAllActivity(){ + return activityService.all(); + } + + @PostMapping() + @ApiOperation(value = "鎶ュ悕娲诲姩", notes = "娲诲姩鎶ュ悕") + public Result activityReport(@RequestBody ActivityReportForm activityReportForm){ + + return myActivityService.activityReport(activityReportForm); + } + + @GetMapping("/getDetail/{activityId}") + @ApiOperation(value = "娲诲姩璇︽儏", notes = "娲诲姩璇︽儏") + public Result getActivityDetail(@PathVariable String activityId){ + return myActivityService.detailByUsr(activityId); + } +} -- Gitblit v1.8.0