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
---
manager-api/src/main/java/cn/lili/controller/lmk/ActivityController.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 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 307070f..553f65e 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,19 +3,23 @@
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 cn.lili.utils.HtmlUtil;
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.*;
+import javax.servlet.http.HttpServletRequest;
import javax.validation.constraints.NotEmpty;
import java.util.List;
@@ -34,16 +38,26 @@
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);
+ public Result add(@RequestBody ActivityForm form) {
+ form.setActivityContent(HtmlUtil.addVideoControls(form.getActivityContent()));
+ return activityService.add(form,true);
}
+
@PutMapping
@ApiOperation(value = "淇敼", notes = "淇敼")
- public Result update(@RequestBody @Validated(Update.class) ActivityForm form) {
- return activityService.update(form);
+ public Result update(@RequestBody ActivityForm form) {
+ form.setActivityContent(HtmlUtil.addVideoControls(form.getActivityContent()));
+ return activityService.update(form,true);
}
@DeleteMapping("/{id}")
--
Gitblit v1.8.0