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-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsSeckillController.java | 51 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 41 insertions(+), 10 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..d0498eb 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,19 +1,19 @@
package com.ruoyi.goods.controller.inner;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.goods.service.IGoodsSeckillService;
import com.ruoyi.system.api.domain.GoodsSeckill;
+import com.ruoyi.system.api.domain.GoodsSku;
+import com.ruoyi.system.api.domain.dto.GoodsStockUpdDTO;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
/**
* <p>
@@ -31,12 +31,33 @@
private final IGoodsSeckillService goodsSeckillService;
+ @InnerAuth
@PostMapping("/getGoodsSeckillOne")
@ResponseBody
- public R<GoodsSeckill> getGoodsSeckillOne(@RequestBody Integer goodsSkuId) {
+ public R<GoodsSeckill> getGoodsSeckillOne(@RequestBody Long goodsSkuId) {
GoodsSeckill GoodsSeckillOne = goodsSeckillService.getById(goodsSkuId);
return R.ok(GoodsSeckillOne);
}
+
+ @InnerAuth
+ @PutMapping("/updGoodsSeckill")
+ R<?> updGoodsSeckill(@RequestBody GoodsStockUpdDTO goodsStockUpdDTOS) {
+ GoodsSeckill GoodsSeckillOne = goodsSeckillService.getById(goodsStockUpdDTOS.getGoodsSkuId());
+ GoodsSeckillOne.setSeckillStock(goodsStockUpdDTOS.getAuctionStock());
+ goodsSeckillService.updateById(GoodsSeckillOne);
+ return R.ok();
+ }
+ @InnerAuth
+ @PutMapping("/updGoodsSeckill1")
+ R<Boolean> updGoodsSeckill1(@RequestBody GoodsSku goodsSku){
+ GoodsSeckill GoodsSeckillOne = goodsSeckillService.getById(goodsSku.getId());
+ Integer m= GoodsSeckillOne.getSoldQuantity()+goodsSku.getSoldQuantity();
+ GoodsSeckillOne.setSoldQuantity(m);
+ goodsSeckillService.updateById(GoodsSeckillOne);
+ return R.ok();
+ }
+
+
/**
* 开始秒杀
*
@@ -45,7 +66,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 +83,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