From c6602babed46a20a8db218bd20d566a67c51d4ed Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 21 六月 2024 18:12:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java
index c87da9f..3ff8451 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java
@@ -458,9 +458,9 @@
auctionGoodsinfoVO.setSharePic(goodsSkuOne.getSharePic());
auctionGoodsinfoVO.setShareTitle(goodsSkuOne.getShareTitle());
LambdaQueryWrapper<AuctionBidRecord> wrapper1= Wrappers.lambdaQuery();
- wrapper1.eq(AuctionBidRecord::getMemberId,auctionGoodsListDTO.getMemberId());
wrapper1.eq(AuctionBidRecord::getAuctionType,1);
wrapper1.eq(AuctionBidRecord::getTargetId,byId.getId());
+ wrapper1.eq(AuctionBidRecord::getMemberId,auctionGoodsListDTO.getMemberId());
wrapper1.eq(AuctionBidRecord::getDelFlag,0);
AuctionBidRecord list1 = auctionBidRecordService.getOne(wrapper1);
if (list1!=null){
@@ -519,6 +519,15 @@
iAuctionBrowseRecordService.save(auctionBrowseRecord);
}
+ LambdaQueryWrapper<AuctionBidRecord> wrapper5= Wrappers.lambdaQuery();
+ wrapper5.eq(AuctionBidRecord::getAuctionType,1);
+ wrapper5.eq(AuctionBidRecord::getTargetId,byId.getId());
+ wrapper5.eq(AuctionBidRecord::getDelFlag,0);
+ AuctionBidRecord list5 = auctionBidRecordService.getOne(wrapper5);
+ if (list5!=null){
+ auctionGoodsinfoVO.setZgBid(list5.getLastBidAmount());
+ }
+
CustomConfig returnAddressUserName = sysUserClient.getconfig("MALL_ORDER_DESCRIPTION").getData();
auctionGoodsinfoVO.setExplain(returnAddressUserName.getConfigValue());
--
Gitblit v1.7.1