From 9bcc40d213a44498c46dae5e678e592b918b40b0 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期四, 30 五月 2024 18:33:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/GoodsSkuClient.java |   25 +++++++++++++++----------
 1 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/GoodsSkuClient.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/GoodsSkuClient.java
index 145a26a..1350f9f 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/GoodsSkuClient.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/GoodsSkuClient.java
@@ -3,7 +3,13 @@
 import com.ruoyi.common.core.constant.SecurityConstants;
 import com.ruoyi.common.core.constant.ServiceNameConstants;
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.system.api.domain.*;
+import com.ruoyi.system.api.domain.GoodsBrand;
+import com.ruoyi.system.api.domain.GoodsCategory;
+import com.ruoyi.system.api.domain.GoodsFlavorType;
+import com.ruoyi.system.api.domain.GoodsSeckill;
+import com.ruoyi.system.api.domain.GoodsSeries;
+import com.ruoyi.system.api.domain.GoodsSku;
+import com.ruoyi.system.api.domain.dto.GoodsStockUpdDTO;
 import com.ruoyi.system.api.factory.GoodsSkuFactory;
 import java.util.List;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -13,7 +19,6 @@
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestParam;
 
 ;
 
@@ -66,13 +71,13 @@
     R<List<GoodsSku>> getGoodsByName(@PathVariable("goodsSkuName") String goodsSkuName,
             @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
-    @PutMapping("/goods-sku/deduct-stock")
-    R<?> deductStock(@RequestParam("goodsSkuId") Long goodsSkuId,
-            @RequestParam("auctionStock") Integer auctionStock,
-            @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
-
-    @PutMapping("/goods-sku/returning-stock")
-    R<?> returningStock(@RequestParam("goodsSkuId") Long goodsSkuId,
-            @RequestParam("auctionStock") Integer auctionStock,
+    /**
+     * 批量更新商品库存 auctionStock 负数则为减库存,正数为加库存
+     *
+     * @param goodsStockUpdDTOS 商品库存修改数据传输对象
+     * @param source            请求来源
+     */
+    @PutMapping("/goods-sku/upd-stock")
+    R<?> updGoodsStock(@RequestBody List<GoodsStockUpdDTO> goodsStockUpdDTOS,
             @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 }

--
Gitblit v1.7.1