From 05fe558f722590aa706c2296c8a9a619d12b42be Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期一, 27 五月 2024 14:35:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsSeckillController.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsSeckillController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsSeckillController.java
index 2b97060..09533e1 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsSeckillController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsSeckillController.java
@@ -1,6 +1,7 @@
package com.ruoyi.goods.controller.inner;
+import com.fasterxml.jackson.core.JsonProcessingException;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.goods.service.IGoodsSeckillService;
@@ -45,7 +46,12 @@
@InnerAuth
@GetMapping("/start/{seckillId}")
R<?> startSeckill(@PathVariable("seckillId") Long seckillId) {
- goodsSeckillService.startSeckill(seckillId);
+ try {
+ goodsSeckillService.startSeckill(seckillId);
+ } catch (JsonProcessingException e) {
+ log.error("秒杀开始异常", e);
+ return R.fail();
+ }
return R.ok();
}
@@ -57,7 +63,12 @@
@InnerAuth
@GetMapping("/end/{seckillId}")
R<?> endSeckill(@PathVariable("seckillId") Long seckillId) {
- goodsSeckillService.endSeckill(seckillId);
+ try {
+ goodsSeckillService.endSeckill(seckillId);
+ } catch (JsonProcessingException e) {
+ log.error("秒杀结束异常", e);
+ return R.fail();
+ }
return R.ok();
}
--
Gitblit v1.7.1