From 15bd9f9a91ea66ff8a9677454d67bf6dc708a967 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期五, 17 五月 2024 18:07:04 +0800
Subject: [PATCH] 拍卖大屏展示
---
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java | 4 ++--
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/VO/AuctionSalesroomGoodsVO.java | 3 +++
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/AuctionSalesroomGoodsController.java | 12 ++++++++++--
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/AuctionBidRecordController.java | 1 +
4 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java
index 30bb5f4..4edbe33 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java
@@ -39,13 +39,13 @@
/**
* 会员模块的serviceid
*/
- public static final String RUOYI_MEMBER = "ruoyi-member";
+ public static final String MEMBER_SERVICE = "ruoyi-member";
/**
* 商品模块的serviceid
*/
- public static final String RUOYI_MODULES_GOODS = "ruoyi-modules-goods";
+ public static final String RUOYI_GOODS = "ruoyi-goods";
/**
* 资讯模块的serviceid
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/VO/AuctionSalesroomGoodsVO.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/VO/AuctionSalesroomGoodsVO.java
index 55fb5bc..2d3280a 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/VO/AuctionSalesroomGoodsVO.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/VO/AuctionSalesroomGoodsVO.java
@@ -50,5 +50,8 @@
@ApiModelProperty(value = "商品描述")
private String description;
+ @ApiModelProperty(value = "下一个商品名称")
+ private String nextGoodsSkuName;
+
}
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/AuctionBidRecordController.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/AuctionBidRecordController.java
index 413f74b..0bb7893 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/AuctionBidRecordController.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/AuctionBidRecordController.java
@@ -52,6 +52,7 @@
wrapper.eq(AuctionBidRecord::getDelFlag,0);
wrapper.orderByDesc(AuctionBidRecord::getLastBidAmount);
AuctionBidRecordList=iAuctionBidRecordService.list(wrapper);
+ //判断
if (AuctionBidRecordList.size()>=auctionSalesroomGoods.getItemQuantity()){
for (int i=0;i<=auctionSalesroomGoods.getItemQuantity();i++){
AuctionBidRecord auctionBidRecord= AuctionBidRecordList.get(i);
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/AuctionSalesroomGoodsController.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/AuctionSalesroomGoodsController.java
index f79bd49..68e70dd 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/AuctionSalesroomGoodsController.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/AuctionSalesroomGoodsController.java
@@ -65,14 +65,14 @@
wrapper1.eq(AuctionSalesroomGoods::getDelFlag,0);
wrapper1.orderByDesc(AuctionSalesroomGoods::getSortNum);
wrapper.last("limit 1");
- auctionSalesroomGoods=auctionSalesroomGoods=iAuctionSalesroomGoodsService.getOne(wrapper1);
+ auctionSalesroomGoods=iAuctionSalesroomGoodsService.getOne(wrapper1);
if (auctionSalesroomGoods==null){
LambdaQueryWrapper<AuctionSalesroomGoods> wrapper2=Wrappers.lambdaQuery();
wrapper2.eq(AuctionSalesroomGoods::getStatus,1);
wrapper2.eq(AuctionSalesroomGoods::getDelFlag,0);
wrapper2.orderByAsc(AuctionSalesroomGoods::getSortNum);
wrapper2.last("limit 1");
- auctionSalesroomGoods=auctionSalesroomGoods=iAuctionSalesroomGoodsService.getOne(wrapper2);
+ auctionSalesroomGoods=iAuctionSalesroomGoodsService.getOne(wrapper2);
}
}
@@ -88,6 +88,14 @@
auctionSalesroomGoodsVO.setCoverPic(goodsSku.getCoverPic());
auctionSalesroomGoodsVO.setDescription(goodsSku.getDescription());
auctionSalesroomGoodsVO.setUnit(goodsSku.getUnit());
+ if (auctionSalesroomGoods.getStatus().getCode()==0){
+ auctionSalesroomGoodsVO.setNextGoodsSkuName(auctionSalesroomGoods.getGoodsSkuName());
+ }if (auctionSalesroomGoods.getStatus().getCode()==2){
+ AuctionSalesroomGoods auctionSalesroomGoodsOne= iAuctionSalesroomGoodsService.getById(auctionSalesroomGoods.getGoodsSkuId()+1);
+ if (auctionSalesroomGoodsOne!=null){
+ auctionSalesroomGoodsVO.setNextGoodsSkuName(auctionSalesroomGoods.getGoodsSkuName());
+ }
+ }
return auctionSalesroomGoodsVO;
}
--
Gitblit v1.7.1