From c9c65a2277d91c0745221b8c631e704debfe6750 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 18:37:57 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java | 22 ++++++++++++++++++----
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionBidRecordVO.java | 10 ++++++++--
2 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionBidRecordVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionBidRecordVO.java
index 5216ce4..6467135 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionBidRecordVO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionBidRecordVO.java
@@ -2,11 +2,11 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonInclude;
+import com.ruoyi.common.core.enums.BidStatusEnum;
import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
import java.math.BigDecimal;
import java.time.LocalDateTime;
+import lombok.Data;
@Data
public class AuctionBidRecordVO {
@@ -30,4 +30,10 @@
@ApiModelProperty(value = "最终出价金额")
@JsonInclude(JsonInclude.Include.ALWAYS)
private BigDecimal lastBidAmount;
+
+ @ApiModelProperty(value = "开始状态 0=淘汰 1=领先")
+ private BidStatusEnum status;
+
+ @ApiModelProperty(value = "头像")
+ private String avatar;
}
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java
index a99e750..ffc0100 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java
@@ -804,14 +804,27 @@
wrapper.orderByDesc(AuctionBidRecord::getLastBidAmount);
wrapper.last("limit 10");
List<AuctionBidRecord> auctionBidRecordList = auctionBidRecordMapper.selectList(wrapper);
+ Set<Long> memberIdSet = auctionBidRecordList.stream().map(AuctionBidRecord::getMemberId)
+ .collect(Collectors.toSet());
+ R<List<Member>> memberListByIds = memberClient.getMemberListByIds(memberIdSet,
+ SecurityConstants.INNER);
+ Map<Long, String> memberMap = new HashMap<>();
+ if (CollUtils.isNotEmpty(memberListByIds.getData())) {
+ memberMap = memberListByIds.getData().stream()
+ .collect(Collectors.toMap(Member::getId, item -> item.getAvatar()));
+ }
List<AuctionBidRecordVO> auctionBidRecordVOList=new ArrayList<>();
for (int i=0;i<auctionBidRecordList.size();i++){
AuctionBidRecordVO auctionBidRecordVO=new AuctionBidRecordVO();
auctionBidRecordVO.setSort(i+1);
- auctionBidRecordVO.setLastBidAmount(auctionBidRecordList.get(i).getLastBidAmount());
- auctionBidRecordVO.setLastBidTime(auctionBidRecordList.get(i).getLastBidTime());
- auctionBidRecordVO.setMemberName(auctionBidRecordList.get(i).getNickname());
- auctionBidRecordVO.setMemberId(auctionBidRecordList.get(i).getMemberId());
+ AuctionBidRecord auctionBidRecord = auctionBidRecordList.get(i);
+ auctionBidRecordVO.setLastBidAmount(auctionBidRecord.getLastBidAmount());
+ auctionBidRecordVO.setLastBidTime(auctionBidRecord.getLastBidTime());
+ auctionBidRecordVO.setMemberName(auctionBidRecord.getNickname());
+ auctionBidRecordVO.setMemberId(auctionBidRecord.getMemberId());
+ auctionBidRecordVO.setStatus(auctionBidRecord.getStatus());
+ auctionBidRecordVO.setAvatar(
+ memberMap.getOrDefault(auctionBidRecord.getMemberId(), ""));
auctionBidRecordVOList.add(auctionBidRecordVO);
}
LambdaQueryWrapper<AuctionBidRecord> wrapper1=Wrappers.lambdaQuery();
@@ -836,6 +849,7 @@
auctionBidRecordVO.setSort(Integer.valueOf(count.intValue()));
auctionBidRecordVO.setLastBidAmount(auctionBidRecord.getLastBidAmount());
auctionBidRecordVO.setLastBidTime(auctionBidRecord.getLastBidTime());
+ auctionBidRecordVO.setStatus(auctionBidRecord.getStatus());
Member data = memberClient.getMembeOne(auctionBidRecord.getMemberId(),
SecurityConstants.INNER).getData();
if (data!=null){
--
Gitblit v1.7.1