From 322cb520e05c48d5d6df1719d7cc3042594ceedb Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期一, 20 五月 2024 10:33:32 +0800
Subject: [PATCH] 拍卖大屏展示
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/AuctionBidRecordController.java | 19 ++++++++++---------
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/AuctionSalesroomController.java | 22 +++++++++++++++++-----
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/AuctionSalesroomGoodsController.java | 4 ++--
3 files changed, 29 insertions(+), 16 deletions(-)
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/AuctionBidRecordController.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/AuctionBidRecordController.java
index b42611e..bd74acd 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/AuctionBidRecordController.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/AuctionBidRecordController.java
@@ -8,6 +8,7 @@
import com.ruoyi.auction.domain.pojo.AuctionSalesroomGoods;
import com.ruoyi.auction.service.IAuctionBidRecordService;
import com.ruoyi.auction.service.IAuctionSalesroomGoodsService;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.enums.BidStatusEnum;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.PathVariable;
@@ -44,25 +45,25 @@
@RequestMapping("/getAuctionBidRecordList")
@ResponseBody
@ApiOperation(value = "拍卖大屏滚动出价")
- public List<AuctionBidRecord> getAuctionBidRecordList(@PathVariable("goodsSkuId") Integer goodsSkuId) {
+ public R<List<AuctionBidRecord>> getAuctionBidRecordList(@PathVariable("goodsSkuId") Integer goodsSkuId) {
AuctionSalesroomGoods auctionSalesroomGoods=iAuctionSalesroomGoodsService.getById(goodsSkuId);
- List<AuctionBidRecord> AuctionBidRecordList=new ArrayList<>();
+ List<AuctionBidRecord> auctionBidRecordList=new ArrayList<>();
if (auctionSalesroomGoods.getStatus().getCode()==1){
LambdaQueryWrapper<AuctionBidRecord> wrapper=Wrappers.lambdaQuery();
wrapper.eq(AuctionBidRecord::getGoodsSkuId,goodsSkuId);
wrapper.eq(AuctionBidRecord::getDelFlag,0);
wrapper.orderByDesc(AuctionBidRecord::getLastBidAmount);
- AuctionBidRecordList=iAuctionBidRecordService.list(wrapper);
+ auctionBidRecordList=iAuctionBidRecordService.list(wrapper);
//判断
- if (AuctionBidRecordList.size()>=auctionSalesroomGoods.getItemQuantity()){
+ if (auctionBidRecordList.size()>=auctionSalesroomGoods.getItemQuantity()){
for (int i=0;i<=auctionSalesroomGoods.getItemQuantity();i++){
- AuctionBidRecord auctionBidRecord= AuctionBidRecordList.get(i);
+ AuctionBidRecord auctionBidRecord= auctionBidRecordList.get(i);
auctionBidRecord.setStatus(BidStatusEnum.LEAD);
}
}else{
- for (int i=0;i<=AuctionBidRecordList.size();i++){
- AuctionBidRecord auctionBidRecord= AuctionBidRecordList.get(i);
+ for (int i=0;i<=auctionBidRecordList.size();i++){
+ AuctionBidRecord auctionBidRecord= auctionBidRecordList.get(i);
auctionBidRecord.setStatus(BidStatusEnum.LEAD);
}
}
@@ -72,9 +73,9 @@
wrapper.eq(AuctionBidRecord::getStatus,2);
wrapper.eq(AuctionBidRecord::getDelFlag,0);
wrapper.orderByDesc(AuctionBidRecord::getLastBidAmount);
- AuctionBidRecordList=iAuctionBidRecordService.list(wrapper);
+ auctionBidRecordList=iAuctionBidRecordService.list(wrapper);
}
- return AuctionBidRecordList;
+ return R.ok(auctionBidRecordList);
}
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/AuctionSalesroomController.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/AuctionSalesroomController.java
index fb3cbd0..946f4dd 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/AuctionSalesroomController.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/AuctionSalesroomController.java
@@ -9,6 +9,7 @@
import com.ruoyi.auction.domain.pojo.AuctionVideo;
import com.ruoyi.auction.service.IAuctionSalesroomService;
import com.ruoyi.auction.service.IAuctionVideoService;
+import com.ruoyi.common.core.domain.R;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -48,12 +49,12 @@
@RequestMapping("/getAuctionBidRecordList")
@ResponseBody
@ApiOperation(value = "拍卖大屏获取拍卖信息")
- public List<AuctionSalesroom> getAuctionBidRecordList(@PathVariable("salesroomName") String salesroomName) {
+ public R<List<AuctionSalesroom>> getAuctionBidRecordList(@PathVariable("salesroomName") String salesroomName) {
LambdaQueryWrapper<AuctionSalesroom> wrapper=Wrappers.lambdaQuery();
wrapper.eq(AuctionSalesroom::getSalesroomName,salesroomName);
wrapper.eq(AuctionSalesroom::getDelFlag,0);
- List<AuctionSalesroom> AuctionBidRecordList=iAuctionSalesroomService.list(wrapper);
- return AuctionBidRecordList;
+ List<AuctionSalesroom> auctionBidRecordList=iAuctionSalesroomService.list(wrapper);
+ return R.ok(auctionBidRecordList);
}
@@ -64,7 +65,7 @@
@RequestMapping("/getBaaner")
@ResponseBody
@ApiOperation(value = " 暖场视频or封面海报")
- public AuctionSalesroomVO getBaaner(@PathVariable("salesroomId") Integer SalesroomId) {
+ public R<AuctionSalesroomVO> getBaaner(@PathVariable("salesroomId") Integer SalesroomId) {
LambdaQueryWrapper<AuctionVideo> wrapper=Wrappers.lambdaQuery();
wrapper.eq(AuctionVideo::getAuctionSalesroomId,SalesroomId);
@@ -78,11 +79,22 @@
}else{
auctionSalesroomVO.setUrl(auctionSalesroom.getCoverPic());
}
- return auctionSalesroomVO;
+
+ return R.ok(auctionSalesroomVO);
}
+ @RequestMapping("/getAuctionBidRecordOne")
+ @ResponseBody
+ @ApiOperation(value = "扫码二维码获取拍卖场信息")
+ public R<AuctionSalesroom> getAuctionBidRecordOne(@PathVariable("salesroomName") String salesroomName) {
+ LambdaQueryWrapper<AuctionSalesroom> wrapper=Wrappers.lambdaQuery();
+ wrapper.eq(AuctionSalesroom::getSalesroomName,salesroomName);
+ wrapper.eq(AuctionSalesroom::getDelFlag,0);
+ AuctionSalesroom auctionBidRecord=iAuctionSalesroomService.getOne(wrapper);
+ return R.ok(auctionBidRecord);
+ }
}
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/AuctionSalesroomGoodsController.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/AuctionSalesroomGoodsController.java
index 99a9aba..75b822c 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/AuctionSalesroomGoodsController.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/AuctionSalesroomGoodsController.java
@@ -51,7 +51,7 @@
@RequestMapping("/getAuctionSalesroomGoods")
@ResponseBody @ApiOperation(value = "拍卖大屏的商品介绍")
- public AuctionSalesroomGoodsVO getAuctionSalesroomGoods(String SalesroomId) {
+ public R<AuctionSalesroomGoodsVO> getAuctionSalesroomGoods(String SalesroomId) {
AuctionSalesroomGoodsVO auctionSalesroomGoodsVO=new AuctionSalesroomGoodsVO();
AuctionSalesroom auctionSalesroom=iAuctionSalesroomService.getById(SalesroomId);
auctionSalesroomGoodsVO.setSalesroomId(auctionSalesroom.getId());
@@ -98,7 +98,7 @@
auctionSalesroomGoodsVO.setNextGoodsSkuName(auctionSalesroomGoods.getGoodsSkuName());
}
}
- return auctionSalesroomGoodsVO;
+ return R.ok(auctionSalesroomGoodsVO);
}
}
--
Gitblit v1.7.1