From 400a06d2ac576740ba10d36b1ac6ffb411cb5cd7 Mon Sep 17 00:00:00 2001 From: paulGao Date: Tue, 31 May 2022 17:23:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=B0=E5=A2=9E=E5=95=86?= =?UTF-8?q?=E5=93=81=E6=97=B6=EF=BC=8C=E6=89=B9=E5=8F=91=E5=95=86=E5=93=81?= =?UTF-8?q?=E8=A7=84=E5=88=99=E6=B2=A1=E6=9C=89=E4=BF=9D=E5=AD=98=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/WholesaleSaleModelRenderImpl.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/goods/sku/render/impl/WholesaleSaleModelRenderImpl.java b/framework/src/main/java/cn/lili/modules/goods/sku/render/impl/WholesaleSaleModelRenderImpl.java index a63660cb..93337ce0 100644 --- a/framework/src/main/java/cn/lili/modules/goods/sku/render/impl/WholesaleSaleModelRenderImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/sku/render/impl/WholesaleSaleModelRenderImpl.java @@ -37,11 +37,9 @@ public class WholesaleSaleModelRenderImpl implements SalesModelRender { @Transactional(rollbackFor = Exception.class) public void renderSingle(GoodsSku goodsSku, GoodsOperationDTO goodsOperationDTO) { Assert.notEmpty(goodsOperationDTO.getWholesaleList(), "批发规则不能为空"); - this.checkWholesaleList(goodsOperationDTO.getWholesaleList()); + this.checkWholesaleList(goodsOperationDTO.getWholesaleList(), goodsSku); List collect = goodsOperationDTO.getWholesaleList().stream().sorted(Comparator.comparing(Wholesale::getPrice)).collect(Collectors.toList()); - if (CharSequenceUtil.isNotEmpty(goodsOperationDTO.getGoodsId())) { - wholesaleService.removeByGoodsId(goodsOperationDTO.getGoodsId()); - } + wholesaleService.removeByGoodsId(goodsSku.getGoodsId()); wholesaleService.saveOrUpdateBatch(collect); goodsSku.setPrice(collect.get(0).getPrice()); goodsSku.setCost(collect.get(0).getPrice()); @@ -51,19 +49,17 @@ public class WholesaleSaleModelRenderImpl implements SalesModelRender { @Transactional(rollbackFor = Exception.class) public void renderBatch(List goodsSkus, GoodsOperationDTO goodsOperationDTO) { Assert.notEmpty(goodsOperationDTO.getWholesaleList(), "批发规则不能为空"); - this.checkWholesaleList(goodsOperationDTO.getWholesaleList()); + this.checkWholesaleList(goodsOperationDTO.getWholesaleList(), goodsSkus.get(0)); List collect = goodsOperationDTO.getWholesaleList().stream().sorted(Comparator.comparing(Wholesale::getPrice)).collect(Collectors.toList()); for (GoodsSku skus : goodsSkus) { skus.setPrice(collect.get(0).getPrice()); skus.setCost(collect.get(0).getPrice()); } - if (CharSequenceUtil.isNotEmpty(goodsOperationDTO.getGoodsId())) { - wholesaleService.removeByGoodsId(goodsOperationDTO.getGoodsId()); - } + wholesaleService.removeByGoodsId(goodsSkus.get(0).getGoodsId()); wholesaleService.saveOrUpdateBatch(collect); } - private void checkWholesaleList(List wholesaleList) { + private void checkWholesaleList(List wholesaleList, GoodsSku goodsSku) { if (CollUtil.isEmpty(wholesaleList)) { throw new ServiceException(ResultCode.MUST_HAVE_SALES_MODEL); } @@ -71,6 +67,10 @@ public class WholesaleSaleModelRenderImpl implements SalesModelRender { if (wholesaleDTO.getPrice() == null || wholesaleDTO.getPrice() <= 0 || wholesaleDTO.getNum() == null || wholesaleDTO.getNum() <= 0) { throw new ServiceException(ResultCode.HAVE_INVALID_SALES_MODEL); } + if (CharSequenceUtil.isEmpty(wholesaleDTO.getGoodsId())) { + wholesaleDTO.setGoodsId(goodsSku.getGoodsId()); + } + } }