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/GoodsSkuController.java | 61 +++++++++++++++++++++++++-----
1 files changed, 51 insertions(+), 10 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsSkuController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsSkuController.java
index 2dc4e9b..d9836c4 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsSkuController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsSkuController.java
@@ -1,19 +1,17 @@
package com.ruoyi.goods.controller.inner;
+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.IGoodsSkuService;
import com.ruoyi.system.api.domain.GoodsSku;
+import com.ruoyi.system.api.domain.dto.GoodsStockUpdDTO;
+import java.util.Collection;
import java.util.List;
import javax.annotation.Resource;
-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.*;
/**
* <p>
@@ -34,15 +32,16 @@
* 获取当前商品信息
*
*/
+ @InnerAuth
@PostMapping("/getGoodsSkuOne")
@ResponseBody
- public R<GoodsSku> getGoodsSkuOne(@RequestBody Integer goodsSkuId) {
+ public R<GoodsSku> getGoodsSkuOne(@RequestBody Long goodsSkuId) {
GoodsSku goodsSkuOne=iGoodsSkuService.getById(goodsSkuId);
return R.ok(goodsSkuOne);
}
-
+ @InnerAuth
@PostMapping("/updateGoodsSkuOne")
@ResponseBody
public R<Boolean> updateGoodsSkuOne(@RequestBody GoodsSku goodsSku) {
@@ -57,8 +56,50 @@
* @return List<GoodsSku>商品SKU列表
*/
@InnerAuth
- @GetMapping("/goods-sku/name/{goodsSkuName}")
+ @GetMapping("/name/{goodsSkuName}")
R<List<GoodsSku>> getGoodsByName(@PathVariable("goodsSkuName") String goodsSkuName) {
return R.ok(iGoodsSkuService.getGoodsByName(goodsSkuName));
}
+
+
+ /**
+ * 批量更新商品库存 auctionStock 负数则为减库存，正数为加库存
+ *
+ * @param goodsStockUpdDTOS 商品库存修改数据传输对象
+ * @param source 请求来源
+ */
+ @InnerAuth
+ @PutMapping("/upd-stock")
+ R<?> updGoodsStock(@RequestBody List<GoodsStockUpdDTO> goodsStockUpdDTOS) {
+ iGoodsSkuService.updGoodsStock(goodsStockUpdDTOS);
+ return R.ok();
+ }
+
+ @InnerAuth
+ @PutMapping("/upd-stock1")
+ R<?> updGoodsStock1(@RequestBody GoodsStockUpdDTO goodsStockUpdDTOS) {
+ iGoodsSkuService.updGoodsStock1(goodsStockUpdDTOS);
+ return R.ok();
+ }
+ @InnerAuth
+ @PutMapping("/updGoods")
+ R<Boolean> updGoods(@RequestBody GoodsSku goodsSku){
+ GoodsSku goodsSkuOne=iGoodsSkuService.getById(goodsSku.getId());
+ Integer h=goodsSkuOne.getSoldQuantity()+goodsSku.getSoldQuantity();
+ goodsSkuOne.setSoldQuantity(h);
+ iGoodsSkuService.updateById(goodsSkuOne);
+ return R.ok();
+ }
+
+ /**
+ * 根据商品id集合查询商品
+ *
+ * @param goodsIdList 商品id集合
+ * @param source 请求来源
+ * @return 商品集合
+ */
+ @PostMapping("/list")
+ R<List<GoodsSku>> getGoodsListByIds(@RequestBody Collection<Long> goodsIdList) {
+ return R.ok(iGoodsSkuService.listByIds(goodsIdList));
+ }
}
--
Gitblit v1.7.1