From fcc1ced7adbaf3338c1e68b0c90275dfae14b4f8 Mon Sep 17 00:00:00 2001 From: KKSU <15274802129@163.com> Date: Mon, 17 Feb 2025 10:45:57 +0800 Subject: [PATCH] test: 更新测试用例中的运单编号 --- src/main/java/cc/mrbird/febs/mall/controller/AdminActivityController.java | 47 +++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 45 insertions(+), 2 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/controller/AdminActivityController.java b/src/main/java/cc/mrbird/febs/mall/controller/AdminActivityController.java index 9db62f5..e128691 100644 --- a/src/main/java/cc/mrbird/febs/mall/controller/AdminActivityController.java +++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminActivityController.java @@ -6,12 +6,15 @@ import cc.mrbird.febs.common.entity.QueryRequest; import cc.mrbird.febs.mall.entity.MallActivity; import cc.mrbird.febs.mall.service.IActivityService; +import cc.mrbird.febs.mall.vo.AdminActivityAddDto; +import cc.mrbird.febs.mall.vo.AdminDiscountVO; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; +import javax.validation.constraints.NotNull; import java.util.Map; @Slf4j @@ -35,7 +38,47 @@ */ @PostMapping("add") @ControllerEndpoint(operation = "新增", exceptionMessage = "新增失败") - public FebsResponse addActivity(@RequestBody @Valid MallActivity mallActivity) { - return iActivityService.addActivity(mallActivity); + public FebsResponse addActivity(@RequestBody @Valid AdminActivityAddDto adminActivityAddDto) { + return iActivityService.addAdminActivity(adminActivityAddDto); + } + + /** + * 修改折扣活动 + */ + @PostMapping("discountUpdate") + @ControllerEndpoint(operation = "修改折扣活动", exceptionMessage = "操作失败") + public FebsResponse discountUpdate(@RequestBody @Valid AdminDiscountVO adminDiscountVO) { + return iActivityService.discountUpdate(adminDiscountVO); + } + + + @GetMapping(value = "/activityList") + public FebsResponse activityList() { + return new FebsResponse().success().data(iActivityService.getAdminActivityList()); + } + + + @GetMapping(value = "/activityListByType/{type}") + public FebsResponse activityListByType(@NotNull(message = "{required}") @PathVariable Integer type) { + return new FebsResponse().success().data(iActivityService.getAdminActivityListByType(type)); + } + + /** + * 活动-开启 + */ + @GetMapping("changeState/{id}/{state}") + @ControllerEndpoint(operation = "活动-开启", exceptionMessage = "操作失败") + public FebsResponse changeState(@NotNull(message = "{required}") @PathVariable Long id + ,@NotNull(message = "{required}") @PathVariable Integer state) { + return iActivityService.changeAdminState(id,state); + } + + /** + * 活动-删除 + */ + @GetMapping("delActivity/{id}") + @ControllerEndpoint(operation = "活动-删除", exceptionMessage = "删除失败") + public FebsResponse delActivity(@NotNull(message = "{required}") @PathVariable Long id) { + return iActivityService.delAdminActivity(id); } } -- Gitblit v1.9.1