Merge remote-tracking branch 'origin/master'

rentaiming

2024-05-30 9bcc40d213a44498c46dae5e678e592b918b40b0

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsSkuController.java

@@ -5,6 +5,7 @@
import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.goods.service.IGoodsSkuService;
import com.ruoyi.system.api.domain.GoodsSku;
import com.ruoyi.system.api.domain.dto.GoodsStockUpdDTO;
import java.util.List;
import javax.annotation.Resource;
import org.springframework.web.bind.annotation.GetMapping;
@@ -13,7 +14,6 @@
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;

@@ -65,31 +65,17 @@
        return R.ok(iGoodsSkuService.getGoodsByName(goodsSkuName));
    }

    /**
     * 扣减商品库存
     *
     * @param goodsSkuId   商品SKU ID
     * @param auctionStock 拍卖商品库存
     */
    @InnerAuth
    @PutMapping("/deduct-stock")
    R<?> deductStock(@RequestParam("goodsSkuId") Long goodsSkuId,
            @RequestParam("auctionStock") Integer auctionStock) {
        iGoodsSkuService.deductStock(goodsSkuId, auctionStock);
        return R.ok();
    }

    /**
     * 退回商品库存
     * 批量更新商品库存 auctionStock 负数则为减库存，正数为加库存
     *
     * @param goodsSkuId   商品SKU ID
     * @param auctionStock 拍卖商品库存
     * @param goodsStockUpdDTOS 商品库存修改数据传输对象
     * @param source            请求来源
     */
    @InnerAuth
    @PutMapping("/goods-sku/returning-stock")
    R<?> returningStock(@RequestParam("goodsSkuId") Long goodsSkuId,
            @RequestParam("auctionStock") Integer auctionStock) {
        iGoodsSkuService.returningStock(goodsSkuId, auctionStock);
    @PutMapping("/goods-sku/upd-stock")
    R<?> returningStock(@RequestBody List<GoodsStockUpdDTO> goodsStockUpdDTOS) {
        iGoodsSkuService.returningStock(goodsStockUpdDTOS);
        return R.ok();
    }
}