From 89c1c5d8ddca497df3094d84d307322e3a685bfd Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 20 六月 2024 18:56:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionGoodsController.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionGoodsController.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionGoodsController.java
index 356e9f0..7dedd1c 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionGoodsController.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionGoodsController.java
@@ -7,8 +7,10 @@
import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.system.api.domain.AuctionGoods;
import com.ruoyi.system.api.domain.dto.AuctionGoodsListDTO;
+import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomDTO;
import com.ruoyi.system.api.domain.vo.AuctionGoodsListVO;
import com.ruoyi.system.api.domain.vo.AuctionGoodsinfoVO;
+import com.ruoyi.system.api.domain.vo.WdMemberAuctionSalesroomVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
@@ -31,27 +33,24 @@
@Resource
private IAuctionGoodsService iAuctionGoodsService;
- @InnerAuth
- @PostMapping("/getAuctionGoodsOne")
- @ResponseBody
- public R<AuctionGoods> getAuctionGoodsOne(@RequestBody Long auctionSalesroomId) {
- AuctionGoods auctionGoods=iAuctionGoodsService.getById(auctionSalesroomId);
- return R.ok(auctionGoods);
- }
- @RequestMapping("/getAuctionGoodsList")
- @ResponseBody
+ @PostMapping("/getAuctionGoodsList")
@ApiOperation(value = "用户端-普通拍卖商品")
public R<PageDTO<AuctionGoodsListVO>> getAuctionGoodsList(@RequestBody AuctionGoodsListDTO auctionGoodsListDTO) {
return R.ok(iAuctionGoodsService.getAuctionGoodsList(auctionGoodsListDTO));
}
- @RequestMapping("/getAuctionGoodsInfo")
- @ResponseBody
+ @PostMapping("/getAuctionGoodsInfo")
@ApiOperation(value = "用户端-普通拍卖商品详情")
public R<AuctionGoodsinfoVO> getAuctionGoodsInfo(@RequestBody AuctionGoodsListDTO auctionGoodsListDTO) {
return R.ok(iAuctionGoodsService.getAuctionGoodsInfo(auctionGoodsListDTO));
}
+
+ @PostMapping("/getWdAuctionSalesList")
+ @ApiOperation(value = "用户端-我的拍卖-我的加入了的普通拍品")
+ public R<PageDTO<AuctionGoodsListVO>> getWdAuctionSalesList(@RequestBody AuctionGoodsListDTO auctionGoodsListDTO) {
+ return R.ok(iAuctionGoodsService.getWdAuctionSalesList(auctionGoodsListDTO));
+ }
}
--
Gitblit v1.7.1