From b29becf95484be48aa09e87fcc7cc19f94cf9c81 Mon Sep 17 00:00:00 2001 From: rentaiming <806181062@qq.com> Date: 星期三, 10 七月 2024 18:16:23 +0800 Subject: [PATCH] 修改bug --- ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/GoodsSkuClient.java | 81 +++++++++++++++++++++++++++++++++++----- 1 files changed, 71 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..db8b94d 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,11 @@ 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.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; @@ -14,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; ; @@ -26,13 +27,51 @@ 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-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, @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, @@ -46,6 +85,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); @@ -54,13 +96,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