From fc13d832e58e42e241aa827e930651a28ca357e1 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 31 五月 2024 11:48:43 +0800
Subject: [PATCH] Merge branch 'mitao-dev'
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java
index 0d2d672..6abdf2d 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java
@@ -92,8 +92,6 @@
*/
@Service
public class AuctionSalesroomServiceImpl extends ServiceImpl<AuctionSalesroomMapper, AuctionSalesroom> implements IAuctionSalesroomService {
- @Resource
- private IAuctionSalesroomService iAuctionSalesroomService;
@Resource
private IAuctionBidRecordService auctionBidRecordService;
@@ -173,7 +171,7 @@
LambdaQueryWrapper<AuctionSalesroom> wrapper=Wrappers.lambdaQuery();
wrapper.eq(AuctionSalesroom::getSalesroomName,ationSalesroomGoodsDTO.getSalesroomName());
wrapper.eq(AuctionSalesroom::getDelFlag,0);
- Page<AuctionSalesroom> page1=iAuctionSalesroomService.page(page, wrapper);
+ Page<AuctionSalesroom> page1 = this.page(page, wrapper);
return PageDTO.of(page1);
}
@@ -184,7 +182,8 @@
wrapper.eq(AuctionVideo::getDelFlag,0);
AuctionVideo auctionVideo=iAuctionVideoService.getOne(wrapper);
ForepartAuctionSalesroomVO forepartAuctionSalesroomVO =new ForepartAuctionSalesroomVO();
- AuctionSalesroom auctionSalesroom=iAuctionSalesroomService.getById(ationSalesroomGoodsDTO.getAuctionSalesroomId());
+ AuctionSalesroom auctionSalesroom = this.getById(
+ ationSalesroomGoodsDTO.getAuctionSalesroomId());
forepartAuctionSalesroomVO.setAuctionSalesroomStatus(auctionSalesroom.getStatus().getCode());
if (auctionVideo!=null){
forepartAuctionSalesroomVO.setUrl(auctionVideo.getPromotionVideoUrl());
@@ -214,7 +213,7 @@
LambdaQueryWrapper<AuctionSalesroom> wrapper=Wrappers.lambdaQuery();
wrapper.eq(AuctionSalesroom::getAuctionSalesroomNo,arepartAuctionBidRecordDTO.getAuctionSalesroomQrcode());
wrapper.eq(AuctionSalesroom::getDelFlag,0);
- AuctionSalesroom auctionBidRecord=iAuctionSalesroomService.getOne(wrapper);
+ AuctionSalesroom auctionBidRecord = this.getOne(wrapper);
return auctionBidRecord;
}
@@ -350,7 +349,7 @@
@Override
public MemberAuctionSalesroomInfoVO getMemberAuctionSalesroomInfo(MemberAuctionSalesroomDTO memberAuctionSalesroomDTO) {
- AuctionSalesroom byId = iAuctionSalesroomService.getById(memberAuctionSalesroomDTO.getAuctionSalesroomId());
+ AuctionSalesroom byId = this.getById(memberAuctionSalesroomDTO.getAuctionSalesroomId());
MemberAuctionSalesroomInfoVO memberAuctionSalesroomInfoVO=new MemberAuctionSalesroomInfoVO();
memberAuctionSalesroomInfoVO.setId(byId.getId());
memberAuctionSalesroomInfoVO.setBound(byId.getBond());
@@ -413,7 +412,7 @@
LambdaQueryWrapper<AuctionSalesroom> wrapper=Wrappers.lambdaQuery();
wrapper.eq(AuctionSalesroom::getAuctionSalesroomNo,MemberAuctionSalesroomDTO.getSalesroomNO());
wrapper.eq(AuctionSalesroom::getDelFlag,0);
- AuctionSalesroom auctionSalesroom=iAuctionSalesroomService.getOne(wrapper);
+ AuctionSalesroom auctionSalesroom = this.getOne(wrapper);
MemberAuctionSalesroomVO memberAuctionSalesroomVO=new MemberAuctionSalesroomVO();
memberAuctionSalesroomVO.setSalesroomName(auctionSalesroom.getSalesroomName());
memberAuctionSalesroomVO.setStatus(auctionSalesroom.getStatus().getCode());
--
Gitblit v1.7.1