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/management/MgtAuctionScreenController.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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 299ef25..6566490 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
@@ -113,7 +113,7 @@
/**
* 添加备选商品
*
- * @param idList 备选商品id集合
+ * @param idStr 备选商品id集合
*/
@PutMapping("/add-backup-goods")
@ApiOperation(value = "选择备选商品", notes = "选择备选商品")
@@ -134,7 +134,11 @@
@ApiOperation("结束当前拍卖商品")
public R<?> stopCurrentGoods(
@ApiParam(name = "id", value = "拍卖场商品id", required = true) @PathVariable("id") Long id) {
- auctionSalesroomService.stopCurrentGoods(id);
+ try {
+ auctionSalesroomService.stopCurrentGoods(id);
+ } catch (JsonProcessingException e) {
+ throw new RuntimeException(e);
+ }
return R.ok();
}
@@ -147,7 +151,11 @@
@ApiOperation("开始下一拍卖商品")
public R<?> startNextGoods(
@ApiParam(name = "id", value = "拍卖场商品id", required = true) @PathVariable("id") Long id) {
- auctionSalesroomService.startNextGoods(id);
+ try {
+ auctionSalesroomService.startNextGoods(id);
+ } catch (JsonProcessingException e) {
+ throw new RuntimeException(e);
+ }
return R.ok();
}
--
Gitblit v1.7.1