From d5a62c975afbaff26d17b61fa7b9fde7e2cb035d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期六, 27 七月 2024 11:44:03 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java
index e941539..2a49467 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java
@@ -1,6 +1,8 @@
 package com.ruoyi.auction.controller.forepart;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.auction.mapper.AuctionGoodsMapper;
 import com.ruoyi.auction.service.IAuctionGoodsService;
 import com.ruoyi.common.core.exception.ServiceException;
@@ -93,9 +95,6 @@
         return R.ok(iAuctionSalesroomService.isMiniLogin(appMiniLoginDto));
     }
 
-
-
-
    @PostMapping("/getMemberAuctionSalesroomList")
     @ApiOperation(value = "用户端-拍卖场信息列表")
     public R<PageDTO<MemberAuctionSalesroomVO>> getMemberAuctionSalesroomList(@RequestBody MemberAuctionSalesroomDTO MemberAuctionSalesroomDTO) {
@@ -119,12 +118,18 @@
     public R<PayInfoVO> SaveSignUpNow(@RequestBody MemberAuctionSalesroomBondDTO memberAuctionSalesroomBondDTO) {
       if (memberAuctionSalesroomBondDTO.getBondType()==1){
           AuctionGoods auctionGoods = AuctionGoodsMapper.selectById(memberAuctionSalesroomBondDTO.getAuctionGoodsId());
-          if (auctionGoods.getEndTime().isAfter(LocalDateTime.now())){
-              throw new ServiceException("商品拍卖已结束");
-          }
           if (auctionGoods.getListingStatus().getCode()==1){
               throw new ServiceException("商品拍卖下线");
           }
+      }else{
+          AuctionSalesroom byId = iAuctionSalesroomService.getById(memberAuctionSalesroomBondDTO.getAuctionSalesroomId());
+          if(byId==null){
+              LambdaQueryWrapper<AuctionSalesroom> wrapper= Wrappers.lambdaQuery();
+              wrapper.eq(AuctionSalesroom::getAuctionSalesroomNo,memberAuctionSalesroomBondDTO.getAuctionSalesroomId());
+              wrapper.eq(AuctionSalesroom::getDelFlag,0);
+              byId =iAuctionSalesroomService.getOne(wrapper);
+              memberAuctionSalesroomBondDTO.setAuctionSalesroomId(byId.getId());
+          }
       }
        PayInfoVO payInfoVO = iAuctionSalesroomService.SaveSignUpNow(memberAuctionSalesroomBondDTO);
 

--
Gitblit v1.7.1