From fc13d832e58e42e241aa827e930651a28ca357e1 Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期五, 31 五月 2024 11:48:43 +0800 Subject: [PATCH] Merge branch 'mitao-dev' --- ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/MgtAuctionSalesroomController.java | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 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 01f611f..0bad556 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,8 +1,10 @@ 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; @@ -79,4 +81,28 @@ return R.ok(); } + /** + * 查看详情 + * + * @param id 拍卖会id + * @return 拍卖场视图对象 + */ + @GetMapping("/{id}") + @ApiOperation(value = "查看详情", notes = "查看详情") + public R<MgtAuctionSalesroomVO> getAuctionSalesroom(@PathVariable("id") Long id) { + return R.ok(auctionSalesroomService.getAuctionSalesroom(id)); + } + + /** + * 查看详情-出价记录 + * + * @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