diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/StockController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/StockController.java index f7380ad3..538e4b44 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/StockController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/StockController.java @@ -72,7 +72,6 @@ public class StockController { @Log("库存导入") @PostMapping("/doImport/v2") @ApiOperation("文件导入库存") - @AnonymousPostMapping public ResponseEntity importExcelV2(@RequestParam String shopId,@RequestParam("file") MultipartFile file) { String fileName = file.getOriginalFilename(); if (file.isEmpty()) { diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbProductSkuRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbProductSkuRepository.java index 4f2fd189..3e1b3909 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbProductSkuRepository.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbProductSkuRepository.java @@ -55,10 +55,7 @@ public interface TbProductSkuRepository extends JpaRepository searchProStockV2(@Param("shopId") String shopId, @Param("proName") String proName, @Param("isStock")Integer isStock, Pageable pageable); @Query("SELECT new cn.ysk.cashier.vo.StockV2Vo(" + diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/StockServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/StockServiceImpl.java index 283c54aa..2c630aaf 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/StockServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/StockServiceImpl.java @@ -12,6 +12,7 @@ import cn.ysk.cashier.repository.shop.TbShopInfoRepository; import cn.ysk.cashier.service.TbProductStockOperateService; import cn.ysk.cashier.service.product.StockService; import cn.ysk.cashier.service.product.TbProductService; +import cn.ysk.cashier.utils.CacheKey; import cn.ysk.cashier.utils.FileUtil; import cn.ysk.cashier.utils.RedisUtils; import cn.ysk.cashier.utils.StringUtils; @@ -260,16 +261,19 @@ public class StockServiceImpl implements StockService { @Transactional public void inHouseV2(String shopId, List list) { - Map idStockMap = new HashMap<>(); + Set proIds=new HashSet<>(); + Set skuIds=new HashSet<>(); for (StockV2Vo stockVo : list) { if (stockVo.getProId() == 0) { tbProductSkuRepository.updateStockNumber2(stockVo.getSkuId(), shopId, Double.parseDouble(stockVo.getNumber().toString())); + skuIds.add(stockVo.getSkuId()); } else { productService.updateStockNumber(stockVo.getProId(), Double.parseDouble(stockVo.getNumber().toString())); + proIds.add(stockVo.getProId()); } - idStockMap.put(stockVo.getSkuId(), Double.parseDouble(stockVo.getNumber().toString())); } - redisUtils.redisUp(2, shopId, idStockMap); + redisUtils.delByIntKey(CacheKey.PRODUCT_SKU + shopId + ":product", proIds); + redisUtils.delByIntKey(CacheKey.PRODUCT_SKU + shopId + ":", skuIds); } @Transactional