From 192605ae903ee44bb90d85c3ff7073456e08dd1d Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Mon, 14 Oct 2024 16:35:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=95=86=E5=93=81=20?= =?UTF-8?q?=E8=A7=84=E6=A0=BC=E4=B8=A2=E5=A4=B1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cashier/service/impl/productimpl/TbProductServiceImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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..dc0d938e 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())) { From f8c763ad9d4d4d3ef4f3dd8b26ec2f2571add7f5 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Tue, 15 Oct 2024 10:06:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=95=86=E5=93=81=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=BA=93=E5=AD=98=20=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TbProductStockOperateServiceImpl.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) 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));