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 | 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 c93b370..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
@@ -2,10 +2,12 @@
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;
@@ -32,7 +34,7 @@
@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);
}
@@ -40,11 +42,20 @@
@InnerAuth
@PutMapping("/updGoodsSeckill")
R<?> updGoodsSeckill(@RequestBody GoodsStockUpdDTO goodsStockUpdDTOS) {
- GoodsSeckill GoodsSeckillOne = goodsSeckillService.getById(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();
+ }
/**
--
Gitblit v1.7.1