From 9dbb6c26c81e94e8f969805b40b0e183bf306f83 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 10 三月 2025 13:55:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-1.0.1' into dev-1.0.1
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsSkuController.java | 60 ++++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 44 insertions(+), 16 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 9a3a0f8..d8075b2 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
@@ -5,6 +5,9 @@
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.Order;
+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;
@@ -13,7 +16,6 @@
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
@@ -39,7 +41,7 @@
@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);
@@ -65,31 +67,57 @@
return R.ok(iGoodsSkuService.getGoodsByName(goodsSkuName));
}
+
/**
- * 扣减商品库存
+ * 批量更新商品库存 auctionStock 负数则为减库存，正数为加库存
*
- * @param goodsSkuId 商品SKU ID
- * @param auctionStock 拍卖商品库存
+ * @param goodsStockUpdDTOS 商品库存修改数据传输对象
+ * @param source 请求来源
*/
@InnerAuth
- @PutMapping("/deduct-stock")
- R<?> deductStock(@RequestParam("goodsSkuId") Long goodsSkuId,
- @RequestParam("auctionStock") Integer auctionStock) {
- iGoodsSkuService.deductStock(goodsSkuId, auctionStock);
+ @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 goodsSkuId 商品SKU ID
- * @param auctionStock 拍卖商品库存
+ * @param goodsIdList 商品id集合
+ * @return 商品集合
*/
@InnerAuth
- @PutMapping("/goods-sku/returning-stock")
- R<?> returningStock(@RequestParam("goodsSkuId") Long goodsSkuId,
- @RequestParam("auctionStock") Integer auctionStock) {
- iGoodsSkuService.returningStock(goodsSkuId, auctionStock);
+ @PostMapping("/list")
+ R<List<GoodsSku>> getGoodsListByIds(@RequestBody Collection<Long> goodsIdList) {
+ return R.ok(iGoodsSkuService.listByIds(goodsIdList));
+ }
+
+ /**
+ * 退款退货订单退库存
+ *
+ * @param order
+ */
+ @InnerAuth
+ @PostMapping("/returnStockByOrder")
+ R<?> returnStockByOrder(@RequestBody Order order) {
+ iGoodsSkuService.returnStockByOrder(order);
return R.ok();
}
}
--
Gitblit v1.7.1