From 464254ba0e542c22fac68c7512f06a9a8df34b28 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 13 六月 2024 21:09:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/GoodsSkuClient.java | 52 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 42 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 6afe181..347eaba 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,9 +3,10 @@
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.GoodsSeckill;
-import com.ruoyi.system.api.domain.GoodsSku;
+import com.ruoyi.system.api.domain.*;
+import com.ruoyi.system.api.domain.dto.GoodsStockUpdDTO;
import com.ruoyi.system.api.factory.GoodsSkuFactory;
+import java.util.Collection;
import java.util.List;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
@@ -14,7 +15,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;
;
@@ -26,9 +26,26 @@
R<GoodsSku> getGoodsSkuOne(@RequestBody Long goodsSkuId,
@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+ @PostMapping("/goods-category/getCategoryOne")
+ R<GoodsCategory> getCategoryOne(@RequestBody Long categoryId,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+ @PostMapping("/goods-series/getSeriesOne")
+ R<GoodsSeries> getSeriesOne(@RequestBody Long seriesId,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+ @PostMapping("/goods-brand/getBrandOne")
+ R<GoodsBrand> getBrandOne(@RequestBody Long brandId,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+ @PostMapping("/goods-flavor-type/getFlavorTypeOne")
+ R<GoodsFlavorType> getFlavorTypeOne(@RequestBody Long flavorTypeId,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+ @PostMapping("/goods-group-purchase/getGoodsSeckiGoodsGroupPurchaseOne")
+ R<GoodsGroupPurchase> getGoodsSeckiGoodsGroupPurchaseOne(@RequestBody Long goodsSkuId,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
@PostMapping("/goods-seckill/getGoodsSeckillOne")
R<GoodsSeckill> getGoodsSeckillOne(@RequestBody Long goodsSkuId,
- @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
@PostMapping("/goods-sku/updateGoodsSkuOne")
R<Boolean> updateGoodsSkuOne(@RequestBody GoodsSku goodsSku,
@@ -54,13 +71,28 @@
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,
+ /**
+ * 批量更新商品库存 auctionStock 负数则为减库存，正数为加库存
+ *
+ * @param goodsStockUpdDTOS 商品库存修改数据传输对象
+ * @param source 请求来源
+ */
+ @PutMapping("/goods-sku/upd-stock")
+ R<?> updGoodsStock(@RequestBody List<GoodsStockUpdDTO> goodsStockUpdDTOS,
@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
- @PutMapping("/goods-sku/returning-stock")
- R<?> returningStock(@RequestParam("goodsSkuId") Long goodsSkuId,
- @RequestParam("auctionStock") Integer auctionStock,
+ @PutMapping("/goods-seckill/updGoodsSeckill")
+ R<?> updGoodsSeckill(@RequestBody GoodsStockUpdDTO goodsStockUpdDTOS,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+ /**
+ * 根据商品id集合查询商品
+ *
+ * @param goodsIdList 商品id集合
+ * @param source 请求来源
+ * @return 商品集合
+ */
+ @PostMapping("/goods-sku/list")
+ R<List<GoodsSku>> getGoodsListByIds(@RequestBody Collection<Long> goodsIdList,
@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
}
--
Gitblit v1.7.1