From 803a61d1d89e75f0b5d72785069b3dceb579f3ca Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期三, 27 八月 2025 10:25:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
manager-api/src/main/java/cn/lili/controller/lmk/PrizeActivityController.java | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/manager-api/src/main/java/cn/lili/controller/lmk/PrizeActivityController.java b/manager-api/src/main/java/cn/lili/controller/lmk/PrizeActivityController.java
index 2a93009..4448ec2 100644
--- a/manager-api/src/main/java/cn/lili/controller/lmk/PrizeActivityController.java
+++ b/manager-api/src/main/java/cn/lili/controller/lmk/PrizeActivityController.java
@@ -2,18 +2,22 @@
import cn.lili.base.Result;
+import cn.lili.cache.Cache;
+import cn.lili.common.security.context.UserContext;
import cn.lili.modules.lmk.domain.form.ActivityRefPrizeForm;
import cn.lili.modules.lmk.domain.form.PrizeActivityForm;
import cn.lili.modules.lmk.domain.query.PrizeActivityQuery;
import cn.lili.modules.lmk.service.ActivityRefPrizeService;
import cn.lili.modules.lmk.service.PrizeActivityService;
import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import javax.validation.constraints.Size;
import java.util.List;
+import java.util.concurrent.TimeUnit;
/**
* lmk-shop-java
@@ -31,6 +35,15 @@
private final PrizeActivityService prizeActivityService;
private final ActivityRefPrizeService activityRefPrizeService;
+
+
+
+
+ @PutMapping("/popup/{id}")
+ public Result popup(@PathVariable("id") String id){
+ return prizeActivityService.popup(id);
+ }
+
@GetMapping
public Result getPage(PrizeActivityQuery query){
return prizeActivityService.page(query);
@@ -39,18 +52,18 @@
public Result detail(@PathVariable("id") String id){
return prizeActivityService.detail(id);
}
- @PutMapping
- public Result edit(@RequestBody PrizeActivityForm form){
- return prizeActivityService.update(form);
- }
+// @PutMapping
+// public Result edit(@RequestBody PrizeActivityForm form){
+// return prizeActivityService.update(form);
+// }
@PostMapping
public Result add(@RequestBody PrizeActivityForm form){
return prizeActivityService.add(form);
}
- @DeleteMapping("/{id}")
- public Result del(@PathVariable("id") String id){
- return prizeActivityService.removeById(id);
- }
+// @DeleteMapping("/{id}")
+// public Result del(@PathVariable("id") String id){
+// return prizeActivityService.removeById(id);
+// }
@PostMapping("/addActivityRefPrizeList/{id}")
public Result addListByPrizeDraw(@PathVariable("id") String prizeActivityId,@RequestBody @Valid @Size(max = 5, message = "濂栧搧鏁伴噺蹇呴』鍦�1鍒�5涓箣闂�") List<ActivityRefPrizeForm> list){
return activityRefPrizeService.addList(prizeActivityId,list);
--
Gitblit v1.8.0