From 5cef063574ad47198f0f8be0ea23dbabec7a0ba3 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 03 六月 2024 12:52:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java | 95 +++++++++++++++++++++++++++--------------------
1 files changed, 55 insertions(+), 40 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 2f39a4e..4262b40 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
@@ -3,9 +3,8 @@
import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsDTO;
import com.ruoyi.auction.controller.forepart.dto.ForepartAuctionBidRecordDTO;
+import com.ruoyi.auction.service.IAuctionSalesroomGoodsService;
import com.ruoyi.common.security.annotation.InnerAuth;
-import com.ruoyi.system.api.domain.GoodsFlavorType;
-import com.ruoyi.system.api.domain.dto.BidVO;
import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomBondDTO;
import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomDTO;
import com.ruoyi.auction.controller.forepart.vo.ForepartAuctionSalesroomVO;
@@ -18,6 +17,8 @@
import com.ruoyi.system.api.domain.AppMiniLoginVO;
import com.ruoyi.system.api.domain.dto.AppMiniLoginDTO;
import com.ruoyi.system.api.domain.vo.PayInfoVO;
+import com.ruoyi.system.api.domain.vo.WdMemberAuctionSalesroomVO;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import javax.annotation.Resource;
@@ -33,28 +34,22 @@
*/
@RestController
@RequestMapping("/forepart/auction-salesroom")
+@Api(value = "拍卖场相关接口", tags = "拍卖场相关接口", description = "拍卖场相关接口")
public class ForepartAuctionSalesroomController {
@Resource
private IAuctionSalesroomService iAuctionSalesroomService;
- @InnerAuth
- @PostMapping("/getAuctionSalesroomOne")
- @ResponseBody
- public R<AuctionSalesroom> getauctionSalesroomOne(@RequestBody Long auctionSalesroomId) {
- AuctionSalesroom auctionSalesroomOne=iAuctionSalesroomService.getById(auctionSalesroomId);
- return R.ok(auctionSalesroomOne);
-
- }
+ @Resource
+ private IAuctionSalesroomGoodsService iAuctionSalesroomGoodsService;
/**
* 拍卖大屏获取拍卖信息
*
*/
- @RequestMapping("getAuctionBidRecordList")
- @ResponseBody
- @ApiOperation(value = "拍卖大屏获取拍卖信息")
+ @PostMapping("getAuctionBidRecordList")
+ @ApiOperation(value = "拍卖大屏-获取拍卖信息")
public R<PageDTO<AuctionSalesroom>> getAuctionBidRecordList(@RequestBody AuctionSalesroomGoodsDTO ctionSalesroomGoodsDTO) {
return R.ok(iAuctionSalesroomService.getAuctionBidRecordList(ctionSalesroomGoodsDTO));
@@ -64,65 +59,85 @@
* 暖场视频or封面海报
*
*/
- @RequestMapping("/getBaaner")
- @ResponseBody
- @ApiOperation(value = " 暖场视频or封面海报")
+ @PostMapping("/getBaaner")
+ @ApiOperation(value = "拍卖大屏-暖场视频or封面海报")
public R<ForepartAuctionSalesroomVO> getBaaner(@RequestBody AuctionSalesroomGoodsDTO ctionSalesroomGoodsDTO) {
-
return R.ok(iAuctionSalesroomService.getBaaner(ctionSalesroomGoodsDTO));
}
- @RequestMapping("/getAuctionBidRecordOne")
- @ResponseBody
- @ApiOperation(value = "扫码二维码获取拍卖场信息")
+ @PostMapping("/getAuctionBidRecordOne")
+ @ApiOperation(value = "拍卖师端-扫码二维码获取拍卖场信息")
public R<AuctionSalesroom> getAuctionBidRecordOne(@RequestBody ForepartAuctionBidRecordDTO arepartAuctionBidRecordDTO) {
return R.ok(iAuctionSalesroomService.getAuctionBidRecordOne(arepartAuctionBidRecordDTO));
}
- @RequestMapping("/actionMiniLogin")
- @ResponseBody
- @ApiOperation(value = "拍卖师第三方登陸")
+ @PostMapping("/actionMiniLogin")
+ @ApiOperation(value = "拍卖师端-第三方登陸")
public R<AppMiniLoginVO> actionMiniLogin(@RequestBody AppMiniLoginDTO appMiniLoginDto) {
return R.ok(iAuctionSalesroomService.actionMiniLogin(appMiniLoginDto));
}
- @RequestMapping("/getMemberAuctionSalesroomList")
- @ResponseBody
- @ApiOperation(value = "用户端拍卖场信息")
+ @PostMapping("/getMemberAuctionSalesroomList")
+ @ApiOperation(value = "用户端-拍卖场信息列表")
public R<PageDTO<MemberAuctionSalesroomVO>> getMemberAuctionSalesroomList(@RequestBody MemberAuctionSalesroomDTO MemberAuctionSalesroomDTO) {
return R.ok(iAuctionSalesroomService.getMemberAuctionSalesroomList(MemberAuctionSalesroomDTO));
}
- @RequestMapping("/getMemberAuctionSalesroomInfo")
- @ResponseBody
- @ApiOperation(value = "用户端拍卖场信息详情")
+ @PostMapping("/getMemberAuctionSalesroomInfo")
+ @ApiOperation(value = "用户端-拍卖场信息详情")
public R<MemberAuctionSalesroomInfoVO> getMemberAuctionSalesroomInfo(@RequestBody MemberAuctionSalesroomDTO memberAuctionSalesroomDTO) {
return R.ok(iAuctionSalesroomService.getMemberAuctionSalesroomInfo(memberAuctionSalesroomDTO));
}
- @RequestMapping("/getMemberAuctionSalesroomSweep")
- @ResponseBody
- @ApiOperation(value = "用户端扫一扫拍卖场信息")
+ @PostMapping("/getMemberAuctionSalesroomSweep")
+ @ApiOperation(value = "用户端-扫一扫拍卖场信息")
public R<MemberAuctionSalesroomVO> getMemberAuctionSalesroomSweep(@RequestBody MemberAuctionSalesroomDTO MemberAuctionSalesroomDTO) {
return R.ok(iAuctionSalesroomService.getMemberAuctionSalesroomSweep(MemberAuctionSalesroomDTO));
}
- @RequestMapping("/SaveSignUpNow")
- @ResponseBody
- @ApiOperation(value = "用户端拍卖立即报名")
+ @PostMapping("/SaveSignUpNow")
+ @ApiOperation(value = "用户端-拍卖立即报名")
public R<PayInfoVO> SaveSignUpNow(@RequestBody MemberAuctionSalesroomBondDTO memberAuctionSalesroomBondDTO) {
return R.ok( iAuctionSalesroomService.SaveSignUpNow(memberAuctionSalesroomBondDTO));
}
- @RequestMapping("/SaveBid")
- @ResponseBody
- @ApiOperation(value = "用户端拍卖出价")
- public R SaveBid(@RequestBody BidVO BidVO) {
- iAuctionSalesroomService.SaveBid(BidVO);
+ @PostMapping("/CancelSignUpNow")
+ @ApiOperation(value = "用户端-拍卖取消报名")
+ public R CancelSignUpNow(@RequestBody MemberAuctionSalesroomBondDTO memberAuctionSalesroomBondDTO) {
+ iAuctionSalesroomService.CancelSignUpNow(memberAuctionSalesroomBondDTO);
+ return R.ok( );
+ }
+
+ /**
+ * 拍卖师端拍卖场立即开始
+ *
+ */
+ @PostMapping("/auctionSalesroomStart")
+ @ApiOperation(value = "拍卖师端-拍卖场立即开始")
+ public R auctionSalesroomStart(@RequestBody AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
+ iAuctionSalesroomGoodsService.auctionSalesroomStart(ationSalesroomGoodsDTO);
return R.ok();
}
+
+ /**
+ * 拍卖师端拍卖场立即开始
+ *
+ */
+ @PostMapping("/auctionSalesroomEnd")
+ @ApiOperation(value = "拍卖师端-拍卖场立即结束")
+ public R auctionSalesroomEnd(@RequestBody AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
+ iAuctionSalesroomGoodsService.auctionSalesroomEnd(ationSalesroomGoodsDTO);
+ return R.ok();
+ }
+
+
+ @PostMapping("/getWdAuctionSalesroomList")
+ @ApiOperation(value = "用户端-我的拍卖-我的加入了的拍卖场")
+ public R<PageDTO<WdMemberAuctionSalesroomVO>> getWdAuctionSalesroomList(@RequestBody MemberAuctionSalesroomDTO MemberAuctionSalesroomDTO) {
+ return R.ok(iAuctionSalesroomService.getWdAuctionSalesroomList(MemberAuctionSalesroomDTO));
+ }
}
--
Gitblit v1.7.1