From 5814d15a328979d3d97a65a8e6e3e70b5204ca32 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 15 七月 2024 11:36:26 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java |   47 ++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 38 insertions(+), 9 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 4f69bcb..e941539 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,7 +1,11 @@
 package com.ruoyi.auction.controller.forepart;
 
 
-import com.ruoyi.system.api.domain.dto.AuctionSalesroomGoodsDTO;
+import com.ruoyi.auction.mapper.AuctionGoodsMapper;
+import com.ruoyi.auction.service.IAuctionGoodsService;
+import com.ruoyi.common.core.exception.ServiceException;
+import com.ruoyi.system.api.domain.AuctionGoods;
+import com.ruoyi.system.api.domain.dto.AuctionSalesroomDTO;
 import com.ruoyi.system.api.domain.dto.ForepartAuctionBidRecordDTO;
 import com.ruoyi.auction.service.IAuctionSalesroomGoodsService;
 import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomBondDTO;
@@ -23,6 +27,9 @@
 
 import org.springframework.web.bind.annotation.*;
 
+import java.time.LocalDateTime;
+import java.util.List;
+
 /**
  * <p>
  * 拍卖场表 前端控制器
@@ -43,13 +50,16 @@
     @Resource
     private IAuctionSalesroomGoodsService iAuctionSalesroomGoodsService;
 
+    @Resource
+    private AuctionGoodsMapper AuctionGoodsMapper;
+
     /**
      * 拍卖大屏获取拍卖信息
      *
      */
-   @PostMapping("getAuctionBidRecordList")
+   @PostMapping("/getAuctionBidRecordList")
     @ApiOperation(value = "拍卖大屏-获取拍卖信息")
-    public R<PageDTO<AuctionSalesroom>> getAuctionBidRecordList(@RequestBody AuctionSalesroomGoodsDTO ctionSalesroomGoodsDTO) {
+    public R<List<AuctionSalesroom>> getAuctionBidRecordList(@RequestBody AuctionSalesroomDTO ctionSalesroomGoodsDTO) {
         return R.ok(iAuctionSalesroomService.getAuctionBidRecordList(ctionSalesroomGoodsDTO));
 
     }
@@ -60,7 +70,7 @@
      */
    @PostMapping("/getBaaner")
     @ApiOperation(value = "拍卖大屏-暖场视频or封面海报")
-    public R<ForepartAuctionSalesroomVO> getBaaner(@RequestBody AuctionSalesroomGoodsDTO ctionSalesroomGoodsDTO) {
+    public R<ForepartAuctionSalesroomVO> getBaaner(@RequestBody AuctionSalesroomDTO ctionSalesroomGoodsDTO) {
         return R.ok(iAuctionSalesroomService.getBaaner(ctionSalesroomGoodsDTO));
     }
 
@@ -71,11 +81,19 @@
         return R.ok(iAuctionSalesroomService.getAuctionBidRecordOne(arepartAuctionBidRecordDTO));
     }
 
-   @PostMapping("/actionMiniLogin")
+    @PostMapping("/actionMiniLogin")
     @ApiOperation(value = "拍卖师端-第三方登陸")
     public R<AppMiniLoginVO> actionMiniLogin(@RequestBody AppMiniLoginDTO appMiniLoginDto) {
         return R.ok(iAuctionSalesroomService.actionMiniLogin(appMiniLoginDto));
     }
+
+    @PostMapping("/isMiniLogin")
+    @ApiOperation(value = "拍卖师端-判断是否是拍卖师")
+    public R<AppMiniLoginVO> isMiniLogin(@RequestBody AppMiniLoginDTO appMiniLoginDto) {
+        return R.ok(iAuctionSalesroomService.isMiniLogin(appMiniLoginDto));
+    }
+
+
 
 
    @PostMapping("/getMemberAuctionSalesroomList")
@@ -99,7 +117,18 @@
    @PostMapping("/SaveSignUpNow")
     @ApiOperation(value = "用户端-拍卖立即报名")
     public R<PayInfoVO> SaveSignUpNow(@RequestBody MemberAuctionSalesroomBondDTO memberAuctionSalesroomBondDTO) {
-        return R.ok( iAuctionSalesroomService.SaveSignUpNow(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("商品拍卖下线");
+          }
+      }
+       PayInfoVO payInfoVO = iAuctionSalesroomService.SaveSignUpNow(memberAuctionSalesroomBondDTO);
+
+       return R.ok(payInfoVO);
     }
 
 
@@ -114,9 +143,9 @@
      * 拍卖师端拍卖场立即开始
      *
      */
-   @PostMapping("/auctionSalesroomStart")
+    @PostMapping("/auctionSalesroomStart")
     @ApiOperation(value = "拍卖师端-拍卖场立即开始")
-    public R auctionSalesroomStart(@RequestBody AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
+    public R auctionSalesroomStart(@RequestBody AuctionSalesroomDTO ationSalesroomGoodsDTO) {
         iAuctionSalesroomGoodsService.auctionSalesroomStart(ationSalesroomGoodsDTO);
         return R.ok();
     }
@@ -128,7 +157,7 @@
      */
    @PostMapping("/auctionSalesroomEnd")
     @ApiOperation(value = "拍卖师端-拍卖场立即结束")
-    public R auctionSalesroomEnd(@RequestBody AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
+    public R auctionSalesroomEnd(@RequestBody AuctionSalesroomDTO ationSalesroomGoodsDTO) {
         iAuctionSalesroomGoodsService.auctionSalesroomEnd(ationSalesroomGoodsDTO);
         return R.ok();
     }

--
Gitblit v1.7.1