From 2427b05aeca08ee3c4998843bf749d35440d461b Mon Sep 17 00:00:00 2001
From: rentaiming <806181662@qq.com>
Date: 星期六, 15 六月 2024 21:33:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java
index 01dd53a..a5d1d18 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java
@@ -23,6 +23,8 @@
import org.springframework.web.bind.annotation.*;
+import java.util.List;
+
/**
* <p>
* 拍卖场表 前端控制器
@@ -47,9 +49,9 @@
* 拍卖大屏获取拍卖信息
*
*/
- @PostMapping("getAuctionBidRecordList")
+ @PostMapping("/getAuctionBidRecordList")
@ApiOperation(value = "拍卖大屏-获取拍卖信息")
- public R<PageDTO<AuctionSalesroom>> getAuctionBidRecordList(@RequestBody AuctionSalesroomDTO ctionSalesroomGoodsDTO) {
+ public R<List<AuctionSalesroom>> getAuctionBidRecordList(@RequestBody AuctionSalesroomDTO ctionSalesroomGoodsDTO) {
return R.ok(iAuctionSalesroomService.getAuctionBidRecordList(ctionSalesroomGoodsDTO));
}
@@ -71,12 +73,20 @@
return R.ok(iAuctionSalesroomService.getAuctionBidRecordOne(arepartAuctionBidRecordDTO));
}
- @PostMapping("/actionMiniLogin")
+ @PostMapping("/actionMiniLogin")
@ApiOperation(value = "拍卖师端-第三方登陸")
public R<AppMiniLoginVO> actionMiniLogin(@RequestBody AppMiniLoginDTO appMiniLoginDto) {
return R.ok(iAuctionSalesroomService.actionMiniLogin(appMiniLoginDto));
}
+ @PostMapping("/isMiniLogin")
+ @ApiOperation(value = "拍卖师端-判断是否是拍卖师")
+ public R<AppMiniLoginVO> isMiniLogin(@RequestBody AppMiniLoginDTO appMiniLoginDto) {
+ return R.ok(iAuctionSalesroomService.isMiniLogin(appMiniLoginDto));
+ }
+
+
+
@PostMapping("/getMemberAuctionSalesroomList")
@ApiOperation(value = "用户端-拍卖场信息列表")
--
Gitblit v1.7.1