From ecd798471256822ba39ac2d063b999f1892fef91 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期二, 04 六月 2024 14:06:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/MgtAuctionSalesroomController.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 48 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/MgtAuctionSalesroomController.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/MgtAuctionSalesroomController.java
index 8fe2c7b..7edd5c3 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/MgtAuctionSalesroomController.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/MgtAuctionSalesroomController.java
@@ -1,18 +1,24 @@
package com.ruoyi.auction.controller.management;
+import com.ruoyi.auction.controller.management.dto.MgtAuctionSaleroomBidRecordQuery;
+import com.ruoyi.auction.controller.management.dto.MgtAuctionSalesroomDTO;
import com.ruoyi.auction.controller.management.dto.MgtAuctionSalesroomQuery;
+import com.ruoyi.auction.controller.management.vo.MgtAuctionBidRecordVO;
import com.ruoyi.auction.controller.management.vo.MgtAuctionSalesroomVO;
import com.ruoyi.auction.service.IAuctionSalesroomService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+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.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -28,7 +34,7 @@
@RestController
@RequestMapping("/mgt/auction-salesroom")
@RequiredArgsConstructor
-@Api(value = "拍卖场管理相关接口", tags = {"管理后台接口"})
+@Api(value = "拍卖场管理相关接口", tags = {"管理后台-拍卖场管理相关接口"})
public class MgtAuctionSalesroomController {
private final IAuctionSalesroomService auctionSalesroomService;
@@ -54,7 +60,8 @@
*/
@GetMapping("/qr-code/{id}")
@ApiOperation(value = "查看二维码", notes = "查看二维码")
- public R<String> getQrCode(@PathVariable("id") Long id) {
+ public R<String> getQrCode(
+ @ApiParam(name = "id", value = "拍卖场id", required = true) @PathVariable("id") Long id) {
try {
return R.ok(auctionSalesroomService.getQrCode(id));
} catch (Exception e) {
@@ -62,4 +69,43 @@
return R.fail();
}
}
+
+ /**
+ * 添加/编辑 拍卖场
+ *
+ * @param dto 拍卖场数据传输对象
+ */
+ @PostMapping("/save")
+ @ApiOperation(value = "添加/编辑 拍卖场", notes = "添加/编辑 拍卖场")
+ public R<?> saveAuctionSalesroom(
+ @Validated @RequestBody MgtAuctionSalesroomDTO dto) {
+ auctionSalesroomService.saveAuctionSalesroom(dto);
+ return R.ok();
+ }
+
+ /**
+ * 查看详情
+ *
+ * @param id 拍卖会id
+ * @return 拍卖场视图对象
+ */
+ @GetMapping("/{id}")
+ @ApiOperation(value = "查看详情", notes = "查看详情")
+ public R<MgtAuctionSalesroomVO> getAuctionSalesroom(
+ @ApiParam(name = "id", value = "拍卖会id", required = true) @PathVariable("id") Long id) {
+ return R.ok(auctionSalesroomService.getAuctionSalesroom(id, Boolean.FALSE));
+ }
+
+ /**
+ * 查看详情-出价记录
+ *
+ * @param query 拍卖场出价记录查询对象
+ * @return PageDTO<MgtAuctionBidRecordVO>
+ */
+ @PostMapping("/bid-record")
+ @ApiOperation(value = "查看详情-出价记录", notes = "查看详情-出价记录")
+ public R<PageDTO<MgtAuctionBidRecordVO>> getAuctionSalesroomBidRecordList(
+ @RequestBody MgtAuctionSaleroomBidRecordQuery query) {
+ return R.ok(auctionSalesroomService.getAuctionSalesroomBidRecordList(query));
+ }
}
--
Gitblit v1.7.1