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-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/GoodsSkuClient.java | 87 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 80 insertions(+), 7 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..f42c226 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
@@ -4,7 +4,10 @@
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.dto.GoodsStockUpdDTO;
+import com.ruoyi.system.api.domain.vo.GoodsInfoTitleValueVO;
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;
@@ -13,7 +16,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;
;
@@ -24,6 +26,14 @@
@PostMapping("/goods-sku/getGoodsSkuOne")
R<GoodsSku> getGoodsSkuOne(@RequestBody Long goodsSkuId,
@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+ @PostMapping("/goods-info-title-value/getlistByGoodsId")
+ R<List<GoodsInfoTitleValueVO>> getlistByGoodsId(@RequestBody Long goodsSkuId,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+ @PostMapping("/goods-info-title-value/getlistByGoodsId1")
+ R<List<GoodsInfoTitleValueVO>> getlistByGoodsId1(@RequestBody Long goodsSkuId,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
@PostMapping("/goods-category/getCategoryOne")
R<GoodsCategory> getCategoryOne(@RequestBody Long categoryId,
@@ -38,6 +48,30 @@
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-group-purchase/getGoodsSeckiGoodsGroupPurchaseInfo")
+ R<GoodsGroupPurchaseInfo> getGoodsSeckiGoodsGroupPurchaseInfo(@RequestBody Long goodsSkuId,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+ @PostMapping("/goods-group-purchase/getGoodsSeckiGoodsGroupPurchaseInfo2")
+ R<GoodsGroupPurchaseInfo> getGoodsSeckiGoodsGroupPurchaseInfo2(@RequestBody String goodsSkuId,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+ @PostMapping("/goods-group-purchase/getGoodsSeckiGoodsGroupPurchaseInfo1")
+ R<GoodsGroupPurchaseInfo> getGoodsSeckiGoodsGroupPurchaseInfo1(@RequestBody GoodsGroupPurchaseInfo goodsGroupPurchaseInfo,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+ @PostMapping("/goods-group-purchase/updgoodsGroupPurchaseInfo")
+ R<?> updgoodsGroupPurchaseInfo(@RequestBody GoodsGroupPurchaseInfo goodsGroupPurchaseInfo,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+ @PostMapping("/goods-group-purchase/updgoodsGroupPurchaseInfo1")
+ R<?> updgoodsGroupPurchaseInfo1(@RequestBody GoodsGroupPurchaseInfo goodsGroupPurchaseInfo,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
@PostMapping("/goods-seckill/getGoodsSeckillOne")
R<GoodsSeckill> getGoodsSeckillOne(@RequestBody Long goodsSkuId,
@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
@@ -45,6 +79,23 @@
@PostMapping("/goods-sku/updateGoodsSkuOne")
R<Boolean> updateGoodsSkuOne(@RequestBody GoodsSku goodsSku,
@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+ @PutMapping("/goods-sku/updGoods")
+ R<Boolean> updGoods(@RequestBody GoodsSku goodsSku,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+
+ @PutMapping("/goods-seckill/updGoodsSeckill1")
+ R<Boolean> updGoodsSeckill1(@RequestBody GoodsSku goodsSku,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+ @GetMapping("/goods-group-purchase/num/{groupPurchaseId}")
+ R<?> GroupPurchaseNum(@PathVariable("groupPurchaseId") Long groupPurchaseId,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+ @GetMapping("/goods-group-purchase/num1/{groupPurchaseId}")
+ R<?> GroupPurchaseNum1(@PathVariable("groupPurchaseId") Long groupPurchaseId,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
@GetMapping("/goods-seckill/start/{seckillId}")
R<?> startSeckill(@PathVariable("seckillId") Long seckillId,
@@ -58,6 +109,9 @@
R<?> startGroupPurchase(@PathVariable("groupPurchaseId") Long groupPurchaseId,
@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+ @GetMapping("/member-goods-collection/tusonUser/{tusonUserId}")
+ R<?> tusonUser(@PathVariable("tusonUserId") Long tusonUserIdId,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
@GetMapping("/goods-group-purchase/end/{groupPurchaseId}")
R<?> endGroupPurchase(@PathVariable("groupPurchaseId") Long groupPurchaseId,
@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
@@ -66,13 +120,32 @@
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-sku/upd-stock1")
+ R<?> updGoodsStock1(@RequestBody GoodsStockUpdDTO goodsStockUpdDTOS,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+ @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