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/inner/AuctionGoodsController.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 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 53ff0e0..10f75a8 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
@@ -6,9 +6,15 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.system.api.domain.AuctionGoods;
+import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomBondDTO;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
/**
* <p>
@@ -28,13 +34,13 @@
@InnerAuth
@PostMapping("/getAuctionGoodsOne")
- public R<AuctionGoods> getAuctionGoodsOne(@RequestBody Long auctionSalesroomId) {
- AuctionGoods auctionGoods=auctionGoodsService.getById(auctionSalesroomId);
+ public R<AuctionGoods> getAuctionGoodsOne(@RequestBody MemberAuctionSalesroomBondDTO memberAuctionSalesroomBondDTO) {
+ AuctionGoods auctionGoods=auctionGoodsService.getById(memberAuctionSalesroomBondDTO.getAuctionGoodsId());
return R.ok(auctionGoods);
}
- @PutMapping("/auction-goods/end/{id}")
+ @PutMapping("/end/{id}")
R<?> endAuctionGoods(@PathVariable("id") Long id) {
try {
auctionGoodsService.endAuctionGoods(id);
@@ -45,7 +51,7 @@
return R.ok();
}
- @PutMapping("/auction-goods/start/{id}")
+ @PutMapping("/start/{id}")
R<?> startAuctionGoods(@PathVariable("id") Long id) {
try {
auctionGoodsService.startAuctionGoods(id);
--
Gitblit v1.7.1