From 12cc56aadad044d31ce1de81f5bbecdf4b99d6bf Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Tue, 8 Oct 2024 16:14:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8v2=E6=94=B9?= =?UTF-8?q?=E4=B8=BApost=20=E7=BB=9F=E8=AE=A1=E5=A4=84=E7=90=86=E7=A9=BA?= =?UTF-8?q?=E5=80=BC=20=E7=BB=91=E5=AE=9A=E7=9B=B8=E5=90=8C=E8=80=97?= =?UTF-8?q?=E6=9D=90=20=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cons/rest/TbProskuConController.java | 3 +- .../service/impl/TbProskuConServiceImpl.java | 31 +++++++++---------- .../product/TbProductController.java | 2 +- .../TbProductStockCountQueryCriteria.java | 8 +++++ 4 files changed, 25 insertions(+), 19 deletions(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbProskuConController.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbProskuConController.java index 740a8b3c..965a5ba6 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbProskuConController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbProskuConController.java @@ -66,9 +66,8 @@ public class TbProskuConController { tbProskuConService.upV2(resources); return new ResponseEntity<>(HttpStatus.CREATED); } catch (BadRequestException be) { - throw new Exception(be.getMessage()); + throw new BadRequestException(be.getMessage()); }catch (Exception e){ - e.printStackTrace(); throw new Exception(e.getMessage()); } } diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbProskuConServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbProskuConServiceImpl.java index 9720bbe8..d1f588d3 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbProskuConServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbProskuConServiceImpl.java @@ -198,29 +198,28 @@ public class TbProskuConServiceImpl implements TbProskuConService { } TbProductSku sku = null; if (resource.getProductSkuId() != 0) { - sku = tbProductSkuRepository.findById(resource.getProductSkuId()).orElseGet(TbProductSku::new); + sku = tbProductSkuRepository.findById(resource.getProductSkuId()).orElseGet(TbProductSku::new); if (ObjectUtil.isNull(sku) || ObjectUtil.isNull(sku.getId())) { throw new BadRequestException("规格信息不存在"); } } TbProskuCon tbConsInfo1 = new TbProskuCon(); - if (resource.getId() == null) { - int count = tbProskuConRepository.countByConInfoIdAndProductSkuIdAndShopId(resource.getConInfoId(), resource.getProductSkuId(), resource.getShopId(), resource.getProductId()); - if (count <= 0) { - BeanUtil.copyProperties(resource, tbConsInfo1, CopyOptions.create().setIgnoreNullValue(true)); - newCons.add(tbConsInfo1); - } else { - StringBuilder strResult = new StringBuilder(product.getName()); - if (sku != null) { - strResult.append(" 规格" + sku.getSpecSnap()); - } - strResult.append("与耗材 " + tbConsInfo.getConName() + " 的对应关系已存在"); - throw new BadRequestException(product.getName().concat("对应的").concat(Objects.nonNull(sku.getSpecSnap())?sku.getSpecSnap():"").concat("规格已存在")); - } - }else { - BeanUtil.copyProperties(resource,tbConsInfo1, CopyOptions.create().setIgnoreNullValue(true)); + + int count = tbProskuConRepository.countByConInfoIdAndProductSkuIdAndShopId(resource.getConInfoId(), resource.getProductSkuId(), resource.getShopId(), resource.getProductId()); + if (count <= 0) { + BeanUtil.copyProperties(resource, tbConsInfo1, CopyOptions.create().setIgnoreNullValue(true)); newCons.add(tbConsInfo1); + } else { + StringBuilder strResult = new StringBuilder(product.getName()); + if (sku != null) { + strResult.append(" 规格" + sku.getSpecSnap()); + } + strResult.append("与耗材 " + tbConsInfo.getConName() + " 的对应关系已存在"); + throw new BadRequestException(strResult.toString()); } + BeanUtil.copyProperties(resource, tbConsInfo1, CopyOptions.create().setIgnoreNullValue(true)); + newCons.add(tbConsInfo1); + } if (!CollectionUtils.isEmpty(newCons)) { tbProskuConRepository.saveAll(newCons); diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductController.java index 5228bebf..c73a2b4b 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductController.java @@ -35,7 +35,7 @@ public class TbProductController { return new ResponseEntity<>(tbProductService.queryAll(criteria, false),HttpStatus.OK); } - @GetMapping("/list/v2") + @PostMapping("/list/v2") @ApiOperation("查询商品列表 新") public ResponseEntity queryTbProductV2(TbProductQueryV2Criteria criteria, Pageable pageable){ return new ResponseEntity<>(tbProductService.queryAllV2(criteria,pageable),HttpStatus.OK); diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductStockCountQueryCriteria.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductStockCountQueryCriteria.java index ce70df1c..9ea5dd1d 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductStockCountQueryCriteria.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductStockCountQueryCriteria.java @@ -2,6 +2,7 @@ package cn.ysk.cashier.dto.product; import cn.ysk.cashier.dto.BaseQueryDto; import lombok.Data; +import org.apache.commons.lang3.StringUtils; /** * @website https://eladmin.vip @@ -20,4 +21,11 @@ public class TbProductStockCountQueryCriteria extends BaseQueryDto { private Integer page = 0; private Integer size = 10; + + public String getProductName() { + if(StringUtils.isNotBlank(productName)){ + return productName; + } + return null; + } } \ No newline at end of file