From 2e1a9c064309e60047473c78f0dd3a88c726bb8d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 11 三月 2025 10:49:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-1.0.1' into dev-1.0.1

---
 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomGoodsController.java |   50 ++++++++++++++++++++++++++------------------------
 1 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomGoodsController.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomGoodsController.java
index 444bb4c..f05c179 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomGoodsController.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomGoodsController.java
@@ -1,20 +1,23 @@
 package com.ruoyi.auction.controller.forepart;
 
 
-import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsDTO;
-import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsInfoDTO;
-import com.ruoyi.auction.controller.forepart.vo.*;
-import com.ruoyi.auction.domain.AuctionSalesroomGoods;
 import com.ruoyi.auction.service.IAuctionSalesroomGoodsService;
 import com.ruoyi.common.core.domain.R;
+import com.ruoyi.system.api.domain.AuctionSalesroomGoods;
+import com.ruoyi.system.api.domain.dto.AuctionSalesroomDTO;
+import com.ruoyi.system.api.domain.dto.AuctionSalesroomGoodsInfoDTO;
+import com.ruoyi.system.api.domain.vo.AuctionSalesroomGoodsInfoVO;
+import com.ruoyi.system.api.domain.vo.AuctionSalesroomVO;
+import com.ruoyi.system.api.domain.vo.ForepartAuctionSalesroomGoodsVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import java.util.List;
 import javax.annotation.Resource;
-import org.apache.poi.ss.formula.functions.T;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -38,10 +41,9 @@
      * 拍卖大屏的商品介绍
      *
      */
-    @RequestMapping("/getAuctionSalesroomGoods")
-    @ResponseBody
+   @PostMapping("/getAuctionSalesroomGoods")
     @ApiOperation(value = "拍卖大屏-商品介绍")
-    public R<ForepartAuctionSalesroomGoodsVO> getAuctionSalesroomGoods(@RequestBody AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
+    public R<ForepartAuctionSalesroomGoodsVO> getAuctionSalesroomGoods(@RequestBody AuctionSalesroomDTO ationSalesroomGoodsDTO) {
         return R.ok(iAuctionSalesroomGoodsService.getAuctionSalesroomGoods(ationSalesroomGoodsDTO));
     }
 
@@ -49,10 +51,9 @@
      * 拍卖师端拍卖场信息
      *
      */
-    @RequestMapping("/getAuctionSalesroominfo")
-    @ResponseBody
+   @PostMapping("/getAuctionSalesroominfo")
     @ApiOperation(value = "拍卖师端-拍卖场详情信息")
-    public R<AuctionSalesroomVO> getAuctionSalesroominfo(@RequestBody AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
+    public R<AuctionSalesroomVO> getAuctionSalesroominfo(@RequestBody AuctionSalesroomDTO ationSalesroomGoodsDTO) {
         return R.ok(iAuctionSalesroomGoodsService.getAuctionSalesroominfo(ationSalesroomGoodsDTO));
     }
 
@@ -63,10 +64,9 @@
      * 判断拍卖师端是否还有未拍卖商品
      *
      */
-    @RequestMapping("/isAuctionSalesroom")
-    @ResponseBody
+   @PostMapping("/isAuctionSalesroom")
     @ApiOperation(value = "拍卖师端-判断拍卖师端是否还有未拍卖商品")
-    public R<List<AuctionSalesroomGoods>> isAuctionSalesroom(@RequestBody AuctionSalesroomGoodsDTO ationSalesroomGoodsDTO) {
+    public R<List<AuctionSalesroomGoods>> isAuctionSalesroom(@RequestBody AuctionSalesroomDTO ationSalesroomGoodsDTO) {
         return R.ok(iAuctionSalesroomGoodsService.isAuctionSalesroom(ationSalesroomGoodsDTO));
     }
 
@@ -75,10 +75,9 @@
      * 拍卖师端拍卖场下一个立即开始
      *
      */
-    @RequestMapping("/auctionSalesroomGoodsStart")
-    @ResponseBody
+   @PostMapping("/auctionSalesroomGoodsStart")
     @ApiOperation(value = "拍卖师端-拍卖场商品下一个立即开始")
-    public R auctionSalesroomGoodsStart(@RequestBody AuctionSalesroomGoodsDTO auctionSalesroomGoodsDTO) {
+    public R auctionSalesroomGoodsStart(@RequestBody AuctionSalesroomDTO auctionSalesroomGoodsDTO) {
         iAuctionSalesroomGoodsService.auctionSalesroomGoodsStart(auctionSalesroomGoodsDTO);
         return R.ok();
     }
@@ -89,23 +88,26 @@
      * 拍卖师端拍卖场下一个立即结束
      *
      */
-    @RequestMapping("/auctionSalesroomGoodsEnd")
-    @ResponseBody
+   @PostMapping("/auctionSalesroomGoodsEnd")
     @ApiOperation(value = "拍卖师端-拍卖场商品立即结束")
-    public R auctionSalesroomGoodsEnd(@RequestBody AuctionSalesroomGoodsDTO auctionSalesroomGoodsDTO) {
+    public R auctionSalesroomGoodsEnd(@RequestBody AuctionSalesroomDTO auctionSalesroomGoodsDTO) {
         iAuctionSalesroomGoodsService.auctionSalesroomGoodsEnd(auctionSalesroomGoodsDTO);
         return R.ok();
     }
 
 
-    @RequestMapping("/getAuctionSalesroomGoodsInfo")
-    @ResponseBody
+   @PostMapping("/getAuctionSalesroomGoodsInfo")
     @ApiOperation(value = "用户端-拍卖场商品详情")
     public R<AuctionSalesroomGoodsInfoVO> getAuctionSalesroomGoodsInfo(@RequestBody AuctionSalesroomGoodsInfoDTO auctionSalesroomGoodsInfoDTO) {
         return R.ok(iAuctionSalesroomGoodsService.getAuctionSalesroomGoodsInfo(auctionSalesroomGoodsInfoDTO));
     }
 
-
+    @GetMapping("/setPopup/{id}")
+    @ApiOperation("标记已弹出弹窗")
+    public R<?> setPopup(@PathVariable("id") Long id) {
+        iAuctionSalesroomGoodsService.setPopup(id);
+        return R.ok();
+    }
 
 
 }

--
Gitblit v1.7.1