From 2427b05aeca08ee3c4998843bf749d35440d461b Mon Sep 17 00:00:00 2001
From: rentaiming <806181662@qq.com>
Date: 星期六, 15 六月 2024 21:33:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/MgtAuctionScreenController.java | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/MgtAuctionScreenController.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/MgtAuctionScreenController.java
index 5ad8e39..299ef25 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/MgtAuctionScreenController.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/MgtAuctionScreenController.java
@@ -1,6 +1,7 @@
package com.ruoyi.auction.controller.management;
+import com.fasterxml.jackson.core.JsonProcessingException;
import com.ruoyi.auction.controller.management.dto.MgtAuctionSalesroomGoodsQuery;
import com.ruoyi.auction.controller.management.dto.MgtAuctionSalesroomQuery;
import com.ruoyi.auction.controller.management.dto.MgtScreenBidPage;
@@ -14,9 +15,10 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
-import java.util.List;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
@@ -25,6 +27,7 @@
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.RequestParam;
import org.springframework.web.bind.annotation.RestController;
/**
@@ -114,8 +117,11 @@
*/
@PutMapping("/add-backup-goods")
@ApiOperation(value = "选择备选商品", notes = "选择备选商品")
- public R<?> addBackupGoods(@RequestBody List<Long> idList) {
- auctionSalesroomService.addBackupGoods(idList);
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "idStr", value = "商品id集合", required = true)
+ })
+ public R<?> addBackupGoods(@RequestParam("idStr") String idStr) {
+ auctionSalesroomService.addBackupGoods(idStr);
return R.ok();
}
@@ -181,7 +187,11 @@
public R<?> startCurrentAuctionSalesroom(
@ApiParam(name = "auctionSalesroomId", value = "拍卖场id", required = true)
@PathVariable("auctionSalesroomId") Long auctionSalesroomId) {
- auctionSalesroomService.startCurrentAuctionSalesroom(auctionSalesroomId);
+ try {
+ auctionSalesroomService.startCurrentAuctionSalesroom(auctionSalesroomId);
+ } catch (JsonProcessingException e) {
+ throw new RuntimeException(e);
+ }
return R.ok();
}
@@ -195,7 +205,11 @@
public R<?> stopCurrentAuctionSalesroom(
@ApiParam(name = "auctionSalesroomId", value = "拍卖场id", required = true)
@PathVariable("auctionSalesroomId") Long auctionSalesroomId) {
- auctionSalesroomService.stopCurrentAuctionSalesroom(auctionSalesroomId);
+ try {
+ auctionSalesroomService.stopCurrentAuctionSalesroom(auctionSalesroomId);
+ } catch (JsonProcessingException e) {
+ throw new RuntimeException(e);
+ }
return R.ok();
}
}
--
Gitblit v1.7.1