From fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 七月 2024 18:51:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionGoodsController.java |   40 ++++++++++++++++++++++++++++++++++++++--
 1 files changed, 38 insertions(+), 2 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 b194185..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
@@ -1,9 +1,21 @@
 package com.ruoyi.auction.controller.forepart;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.ruoyi.auction.service.IAuctionGoodsService;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.page.PageDTO;
+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.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
 
 /**
  * <p>
@@ -15,6 +27,30 @@
  */
 @RestController
 @RequestMapping("/forepart/auction-goods")
+@Api(value = "普通拍卖相关接口", tags = "普通拍卖相关接口", description = "普通拍卖相关接口")
 public class ForepartAuctionGoodsController {
 
+    @Resource
+    private IAuctionGoodsService iAuctionGoodsService;
+
+
+
+     @PostMapping("/getAuctionGoodsList")
+    @ApiOperation(value = "用户端-普通拍卖商品")
+    public R<PageDTO<AuctionGoodsListVO>> getAuctionGoodsList(@RequestBody AuctionGoodsListDTO auctionGoodsListDTO) {
+        return R.ok(iAuctionGoodsService.getAuctionGoodsList(auctionGoodsListDTO));
+    }
+
+
+     @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