From b19813f4f558c350b2c6e8fcb821080b0c10b257 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 29 五月 2024 19:52:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java | 35 ++++++++++++++++++++++++++++-------
1 files changed, 28 insertions(+), 7 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 b2a1fab..2f39a4e 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,22 +3,25 @@
import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsDTO;
import com.ruoyi.auction.controller.forepart.dto.ForepartAuctionBidRecordDTO;
+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;
import com.ruoyi.auction.controller.forepart.vo.MemberAuctionSalesroomInfoVO;
import com.ruoyi.auction.controller.forepart.vo.MemberAuctionSalesroomVO;
-import com.ruoyi.auction.domain.AuctionSalesroom;
+import com.ruoyi.system.api.domain.AuctionSalesroom;
import com.ruoyi.auction.service.IAuctionSalesroomService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.system.api.domain.AppMiniLoginVO;
import com.ruoyi.system.api.domain.dto.AppMiniLoginDTO;
+import com.ruoyi.system.api.domain.vo.PayInfoVO;
import io.swagger.annotations.ApiOperation;
import javax.annotation.Resource;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+
+import org.springframework.web.bind.annotation.*;
/**
* <p>
@@ -35,6 +38,15 @@
@Resource
private IAuctionSalesroomService iAuctionSalesroomService;
+
+ @InnerAuth
+ @PostMapping("/getAuctionSalesroomOne")
+ @ResponseBody
+ public R<AuctionSalesroom> getauctionSalesroomOne(@RequestBody Long auctionSalesroomId) {
+ AuctionSalesroom auctionSalesroomOne=iAuctionSalesroomService.getById(auctionSalesroomId);
+ return R.ok(auctionSalesroomOne);
+
+ }
/**
* 拍卖大屏获取拍卖信息
@@ -100,8 +112,17 @@
@RequestMapping("/SaveSignUpNow")
@ResponseBody
@ApiOperation(value = "用户端拍卖立即报名")
- public R<MemberAuctionSalesroomVO> SaveSignUpNow(@RequestBody MemberAuctionSalesroomDTO MemberAuctionSalesroomDTO) {
- return R.ok(iAuctionSalesroomService.getMemberAuctionSalesroomSweep(MemberAuctionSalesroomDTO));
+ 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);
+ return R.ok();
}
}
--
Gitblit v1.7.1