Merge remote-tracking branch 'origin/master'

mitao

2024-07-29 fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/GoodsSkuClient.java

@@ -5,6 +5,7 @@
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;
@@ -26,6 +27,14 @@
    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,
            @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
@@ -43,6 +52,26 @@
    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);
@@ -50,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,
@@ -63,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);
@@ -81,6 +130,14 @@
    R<?> updGoodsStock(@RequestBody List<GoodsStockUpdDTO> goodsStockUpdDTOS,
            @RequestHeader(SecurityConstants.FROM_SOURCE) String source);

    @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集合查询商品
     *