From 8c1a5c71d072a028cd01c57b968bbf477c934013 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 11 七月 2025 10:03:58 +0800
Subject: [PATCH] 合并
---
manager-api/src/main/java/cn/lili/controller/lmk/ActivityController.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/manager-api/src/main/java/cn/lili/controller/lmk/ActivityController.java b/manager-api/src/main/java/cn/lili/controller/lmk/ActivityController.java
index 8d0be71..df6a805 100644
--- a/manager-api/src/main/java/cn/lili/controller/lmk/ActivityController.java
+++ b/manager-api/src/main/java/cn/lili/controller/lmk/ActivityController.java
@@ -3,10 +3,13 @@
import cn.lili.base.Result;
import cn.lili.group.Add;
import cn.lili.group.Update;
+import cn.lili.modules.lmk.domain.form.ActivityAuditRecordForm;
import cn.lili.modules.lmk.domain.form.ActivityForm;
import cn.lili.modules.lmk.domain.form.CustomerBlackForm;
+import cn.lili.modules.lmk.domain.query.ActivityMembersQuery;
import cn.lili.modules.lmk.domain.query.ActivityQuery;
import cn.lili.modules.lmk.domain.query.CustomerBlackQuery;
+import cn.lili.modules.lmk.service.ActivityAuditRecordService;
import cn.lili.modules.lmk.service.ActivityService;
import cn.lili.modules.lmk.service.CustomerBlackService;
import io.swagger.annotations.Api;
@@ -33,16 +36,23 @@
private final ActivityService activityService;
+ private final ActivityAuditRecordService activityAuditRecordService;
+
+ @PostMapping("/audit")
+ public Result auditActivity(@RequestBody @Validated(Add.class) ActivityAuditRecordForm form){
+ return activityAuditRecordService.addOrUpdateAuditActivity(form);
+ }
+
@PostMapping
@ApiOperation(value = "娣诲姞", notes = "娣诲姞")
public Result add(@RequestBody @Validated(Add.class) ActivityForm form) {
- return activityService.add(form);
+ return activityService.add(form,true);
}
@PutMapping
@ApiOperation(value = "淇敼", notes = "淇敼")
public Result update(@RequestBody @Validated(Update.class) ActivityForm form) {
- return activityService.update(form);
+ return activityService.update(form,true);
}
@DeleteMapping("/{id}")
@@ -63,7 +73,7 @@
return activityService.page(query);
}
- @GetMapping("/{idh }")
+ @GetMapping("/{id}")
@ApiOperation(value = "璇︽儏", notes = "璇︽儏")
public Result detail(@PathVariable("id") String id) {
return activityService.detail(id);
@@ -85,4 +95,12 @@
public Result activityChangeRecommend(@RequestBody ActivityForm form){
return activityService.activityChangeRecommend(form);
}
+
+ @GetMapping("/activityMembersPage")
+ @ApiOperation(value = "娲诲姩鎶ュ悕浜哄憳鍒嗛〉", notes = "娲诲姩鎶ュ悕浜哄憳鍒嗛〉")
+ public Result activityMembersPage(ActivityMembersQuery query){
+ return activityService.activityMembersPage(query);
+ }
+
+
}
--
Gitblit v1.8.0