From 8e2af5c93cfe23de86df7a52bc89f601a6391c11 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期六, 20 七月 2024 21:22:07 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 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 053ad8a..3881244 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
@@ -427,6 +427,7 @@
             wrapper.eq(AuctionSalesroom::getAuctionSalesroomNo,memberAuctionSalesroomDTO.getAuctionSalesroomId());
             wrapper.eq(AuctionSalesroom::getDelFlag,0);
             byId =this.getOne(wrapper);
+            memberAuctionSalesroomDTO.setAuctionSalesroomId(byId.getId());
         }
 
         if (byId.getType().getCode()==0){
@@ -446,6 +447,7 @@
         memberAuctionSalesroomInfoVO.setStartTime(byId.getStartTime());
         memberAuctionSalesroomInfoVO.setStatus(byId.getStatus());
         memberAuctionSalesroomInfoVO.setCoverPic(byId.getCoverPic());
+
         List<OrderAuctionBond> data = orderClient.getOrderAuctionBondList1(memberAuctionSalesroomDTO, SecurityConstants.INNER).getData();
         if (data.size()>0){
             memberAuctionSalesroomInfoVO.setIsApply(2);
@@ -567,6 +569,15 @@
     @Override
     public void CancelSignUpNow(MemberAuctionSalesroomBondDTO memberAuctionSalesroomBondDTO) {
         if (memberAuctionSalesroomBondDTO.getBondType()==2){
+            AuctionSalesroom byId = this.getById(memberAuctionSalesroomBondDTO.getAuctionSalesroomId());
+            if(byId==null){
+                LambdaQueryWrapper<AuctionSalesroom> wrapper= Wrappers.lambdaQuery();
+                wrapper.eq(AuctionSalesroom::getAuctionSalesroomNo,memberAuctionSalesroomBondDTO.getAuctionSalesroomId());
+                wrapper.eq(AuctionSalesroom::getDelFlag,0);
+                byId =this.getOne(wrapper);
+                memberAuctionSalesroomBondDTO.setAuctionSalesroomId(byId.getId());
+            }
+
             OrderAuctionBond orderAuctionBond = orderClient.getOrderAuctionBondone(memberAuctionSalesroomBondDTO, SecurityConstants.INNER).getData();
 
             List<RefundDTO> refundDTOList = new ArrayList<>();
@@ -636,6 +647,14 @@
             if (byId.getStartingPrice().doubleValue()>bidVO.getLastBidAmount().doubleValue()){
                 throw new ServiceException("出价不能比起拍价低");
             }
+            AuctionSalesroom byId1 = this.getById(bidVO.getAuctionSalesroomId());
+            if(byId1==null){
+                LambdaQueryWrapper<AuctionSalesroom> wrapper= Wrappers.lambdaQuery();
+                wrapper.eq(AuctionSalesroom::getAuctionSalesroomNo,bidVO.getAuctionSalesroomId());
+                wrapper.eq(AuctionSalesroom::getDelFlag,0);
+                AuctionSalesroom one = this.getOne(wrapper);
+                bidVO.setAuctionSalesroomId(one.getId());
+            }
 
             LambdaQueryWrapper<AuctionBidRecord> wrapper3=Wrappers.lambdaQuery();
             wrapper3.eq(AuctionBidRecord::getAuctionSalesroomId,bidVO.getAuctionSalesroomId());

--
Gitblit v1.7.1