From fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 七月 2024 18:51:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/MgtAuctionGoodsController.java | 40 +++++++++++++++++++++++++++++++---------
1 files changed, 31 insertions(+), 9 deletions(-)
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/MgtAuctionGoodsController.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/MgtAuctionGoodsController.java
index f8e18fc..4fab669 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/MgtAuctionGoodsController.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/MgtAuctionGoodsController.java
@@ -1,14 +1,16 @@
package com.ruoyi.auction.controller.management;
-import com.ruoyi.auction.controller.management.dto.AuctionGoodsDTO;
-import com.ruoyi.auction.controller.management.dto.AuctionGoodsQuery;
-import com.ruoyi.auction.controller.management.vo.AuctionGoodsVO;
+import com.ruoyi.auction.controller.management.dto.MgtAuctionGoodsDTO;
+import com.ruoyi.auction.controller.management.dto.MgtAuctionGoodsQuery;
+import com.ruoyi.auction.controller.management.vo.MgtAuctionGoodsVO;
import com.ruoyi.auction.service.IAuctionGoodsService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
+import com.ruoyi.system.api.domain.dto.ListStatusDTO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
@@ -27,7 +29,7 @@
* @author mitao
* @since 2024-05-16
*/
-@Api(value = "拍卖商品管理相关接口", tags = {"管理后台接口"})
+@Api(value = "拍卖商品管理相关接口", tags = {"管理后台-拍卖商品管理相关接口"})
@RestController
@RequiredArgsConstructor
@RequestMapping("/mgt/auction-goods")
@@ -43,8 +45,8 @@
*/
@ApiOperation(value = "获取拍卖商品列表的分页数据", notes = "获取拍卖商品列表的分页数据")
@PostMapping("/page")
- public R<PageDTO<AuctionGoodsVO>> getAuctionGoodsPage(
- AuctionGoodsQuery query) {
+ public R<PageDTO<MgtAuctionGoodsVO>> getAuctionGoodsPage(
+ @Validated @RequestBody MgtAuctionGoodsQuery query) {
return R.ok(auctionGoodsService.getAuctionGoodsPage(query));
}
@@ -56,7 +58,8 @@
*/
@ApiOperation(value = "查看详情", notes = "查看详情")
@GetMapping("/{id}")
- public R<AuctionGoodsVO> getAuctionGoods(@PathVariable("id") Long id) {
+ public R<MgtAuctionGoodsVO> getAuctionGoods(
+ @ApiParam(name = "id", value = "拍卖商品id", required = true) @PathVariable("id") Long id) {
return R.ok(auctionGoodsService.getAuctionGoodsById(id));
}
@@ -67,15 +70,34 @@
*/
@ApiOperation(value = "添加/编辑 拍卖商品", notes = "添加/编辑 拍卖商品")
@PostMapping("/save")
- public R<?> saveAuctionGoods(@Validated @RequestBody AuctionGoodsDTO dto) {
+ public R<?> saveAuctionGoods(@Validated @RequestBody MgtAuctionGoodsDTO dto) {
auctionGoodsService.saveAuctionGoods(dto);
return R.ok();
}
+ /**
+ * 立即结束
+ *
+ * @param id 拍卖商品id
+ */
@ApiOperation("立即结束")
@PutMapping("/stop/{id}")
- public R<?> stopAuctionGoods(@PathVariable("id") Long id) {
+ public R<?> stopAuctionGoods(
+ @ApiParam(name = "id", value = "拍卖商品id", required = true) @PathVariable("id") Long id) {
auctionGoodsService.stopAuctionGoods(id);
return R.ok();
}
+
+ /**
+ * 下架/上架 拍卖商品
+ *
+ * @param dto 商品上下架状态对象
+ */
+ @ApiOperation(value = "下架/上架 拍卖商品", notes = "下架/上架 拍卖商品")
+ @PutMapping("/upd-status")
+ public R<?> updStatus(@Validated @RequestBody ListStatusDTO dto) {
+ auctionGoodsService.updStatus(dto);
+ return R.ok();
+ }
+
}
--
Gitblit v1.7.1