From d6eb0db20437b43a1748c5cdeaeefcbc99145ac7 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 17 七月 2025 15:24:02 +0800
Subject: [PATCH] 订单详情图片显示问题
---
manager-api/src/main/java/cn/lili/controller/lmk/ActivityController.java | 33 ++++++++++++++++++++++++++++-----
1 files changed, 28 insertions(+), 5 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..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,18 +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;
@@ -33,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}")
@@ -63,7 +78,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 +100,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