From 5cef063574ad47198f0f8be0ea23dbabec7a0ba3 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 03 六月 2024 12:52:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/inner/AuctionGoodsController.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/inner/AuctionGoodsController.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/inner/AuctionGoodsController.java
index 4e67aac..53ff0e0 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/inner/AuctionGoodsController.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/inner/AuctionGoodsController.java
@@ -4,12 +4,11 @@
import com.fasterxml.jackson.core.JsonProcessingException;
import com.ruoyi.auction.service.IAuctionGoodsService;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.security.annotation.InnerAuth;
+import com.ruoyi.system.api.domain.AuctionGoods;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
/**
* <p>
@@ -27,6 +26,14 @@
private final IAuctionGoodsService auctionGoodsService;
+ @InnerAuth
+ @PostMapping("/getAuctionGoodsOne")
+ public R<AuctionGoods> getAuctionGoodsOne(@RequestBody Long auctionSalesroomId) {
+ AuctionGoods auctionGoods=auctionGoodsService.getById(auctionSalesroomId);
+ return R.ok(auctionGoods);
+
+ }
+
@PutMapping("/auction-goods/end/{id}")
R<?> endAuctionGoods(@PathVariable("id") Long id) {
try {
--
Gitblit v1.7.1