From 7ce97a95ba44b18aa525b2c0540e5162c59d1474 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 31 五月 2024 11:51:50 +0800
Subject: [PATCH] 解决冲突
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/MgtAuctionGoodsController.java | 41 ++++++++++++++++++++++++++++++++++-------
1 files changed, 34 insertions(+), 7 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 a3c23a3..f27ae1a 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,9 +1,9 @@
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;
@@ -11,7 +11,10 @@
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -24,7 +27,7 @@
* @author mitao
* @since 2024-05-16
*/
-@Api(value = "管理后台拍卖商品相关接口", tags = {"管理后台接口"})
+@Api(value = "拍卖商品管理相关接口", tags = {"管理后台接口"})
@RestController
@RequiredArgsConstructor
@RequestMapping("/mgt/auction-goods")
@@ -40,15 +43,39 @@
*/
@ApiOperation(value = "获取拍卖商品列表的分页数据", notes = "获取拍卖商品列表的分页数据")
@PostMapping("/page")
- public R<PageDTO<AuctionGoodsVO>> getAuctionGoodsPage(
- AuctionGoodsQuery query) {
+ public R<PageDTO<MgtAuctionGoodsVO>> getAuctionGoodsPage(
+ MgtAuctionGoodsQuery query) {
return R.ok(auctionGoodsService.getAuctionGoodsPage(query));
}
+ /**
+ * 查看详情
+ *
+ * @param id 拍卖商品id
+ * @return AuctionGoodsVO
+ */
+ @ApiOperation(value = "查看详情", notes = "查看详情")
+ @GetMapping("/{id}")
+ public R<MgtAuctionGoodsVO> getAuctionGoods(@PathVariable("id") Long id) {
+ return R.ok(auctionGoodsService.getAuctionGoodsById(id));
+ }
+
+ /**
+ * 添加/编辑 拍卖商品
+ *
+ * @param dto 拍卖商品数据传输对象
+ */
@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();
}
+
+ @ApiOperation("立即结束")
+ @PutMapping("/stop/{id}")
+ public R<?> stopAuctionGoods(@PathVariable("id") Long id) {
+ auctionGoodsService.stopAuctionGoods(id);
+ return R.ok();
+ }
}
--
Gitblit v1.7.1