diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java index 864f945c..46fdf887 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java @@ -459,15 +459,14 @@ public class TbProductServiceImpl implements TbProductService { tbProductRepository.save(save); //sku if (resources.getSkuList() != null) { - List skuList = new ArrayList<>(); for (TbProductSku sku : resources.getSkuList()) { sku.setProductId(String.valueOf(save.getId())); sku.setShopId(save.getShopId()); sku.setCreatedAt(Instant.now().toEpochMilli()); sku.setUpdatedAt(Instant.now().toEpochMilli()); sku.setIsGrounding(1); - skuList.add(sku); } + tbProductSkuRepository.saveAll(resources.getSkuList()); } //保存到sku_result if ("sku".equals(resources.getTypeEnum())) { @@ -663,12 +662,6 @@ public class TbProductServiceImpl implements TbProductService { public void deleteAll(Integer[] ids) { List list = Arrays.asList(ids); tbProductRepository.updateByStatus(list); - list.forEach(productId -> { - List tbProductSkus = tbProductSkuRepository.searchSku(productId.toString()); - Map idStockMap = tbProductSkus.stream() - .collect(Collectors.toMap(TbProductSku::getId, TbProductSku::getStockNumber)); - redisUtils.redisUp(2, tbProductSkus.get(0).getShopId(), idStockMap); - }); } @Override diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStockOperateServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStockOperateServiceImpl.java index c856e48b..dfa68180 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStockOperateServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStockOperateServiceImpl.java @@ -417,13 +417,9 @@ public class TbProductStockOperateServiceImpl implements TbProductStockOperateSe .eq(TbProduct::getId, stockRecordMsg.getProductId()) .eq(TbProduct::getIsDel, 0)); - TbProductSku productSku = producSkutMapper.selectOne(new LambdaUpdateWrapper() - .eq(TbProductSku::getShopId, stockRecordMsg.getShopId()) - .eq(TbProductSku::getId, stockRecordMsg.getSkuId()) - .eq(TbProductSku::getIsDel, 0)); - if (product == null || productSku == null) { - log.info("商品或sku不存在"); - throw new BadRequestException("商品或sku不存在"); + if (product == null) { + log.info("商品不存在"); + throw new BadRequestException("商品不存在"); } TbShopUnit tbShopUnit = shopUnitRepository.findById(product.getUnitId()).orElse(null); @@ -469,9 +465,9 @@ public class TbProductStockOperateServiceImpl implements TbProductStockOperateSe productStockDetail.setSkuId(String.valueOf(stockRecordMsg.getSkuId())); productStockDetail.setSubType(stockRecordMsg.getSubType()); productStockDetail.setType(stockRecordMsg.getType()); - productStockDetail.setSpecSnap(productSku.getSpecSnap()); + productStockDetail.setSpecSnap(""); productStockDetail.setStockNumber(Double.valueOf(stockRecordMsg.getNumber())); - productStockDetail.setCostAmount(productSku.getSalePrice().multiply(BigDecimal.valueOf(Math.abs(stockRecordMsg.getNumber())))); +// productStockDetail.setCostAmount(productSku.getSalePrice().multiply(BigDecimal.valueOf(Math.abs(stockRecordMsg.getNumber())))); productStockDetail.setLeftNumber(product.getStockNumber() - stockRecordMsg.getNumber()); productStockDetail.setRecordId(stockOperate.getId().toString()); productStockDetail.setStockSnap(JSONObject.toJSONString(snapItem));