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 3471f737..39eea495 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 @@ -68,7 +68,7 @@ public class TbProskuConController { throw new Exception(be.getMessage()); }catch (Exception e){ e.printStackTrace(); - throw new Exception("相同商品耗材信息不允许添加"); + throw new Exception("参数错误"); } } diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/dto/TbProskuConDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/dto/TbProskuConDto.java index af5088be..9a2844a8 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/dto/TbProskuConDto.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/dto/TbProskuConDto.java @@ -15,10 +15,8 @@ */ package cn.ysk.cashier.cons.service.dto; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.persistence.Column; import java.math.BigDecimal; import java.sql.Timestamp; import java.io.Serializable; diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/dto/TbProskuConDtoV2.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/dto/TbProskuConDtoV2.java index b11f8d8b..5cfc8548 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/dto/TbProskuConDtoV2.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/dto/TbProskuConDtoV2.java @@ -1,6 +1,5 @@ package cn.ysk.cashier.cons.service.dto; -import cn.ysk.cashier.cons.domain.TbProskuCon; import lombok.Data; import javax.validation.constraints.NotNull; @@ -11,5 +10,5 @@ public class TbProskuConDtoV2 { @NotNull private Integer productId; - List cons; + List cons; } 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 27bed072..66ab95db 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 @@ -1,5 +1,7 @@ package cn.ysk.cashier.cons.service.impl; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.bean.copier.CopyOptions; import cn.hutool.core.util.ObjectUtil; import cn.ysk.cashier.cons.domain.TbConsInfo; import cn.ysk.cashier.cons.domain.TbConsSuppFlow; @@ -172,7 +174,7 @@ public class TbProskuConServiceImpl implements TbProskuConService { throw new BadRequestException("对应的商品信息不存在"); } - List collect = resources.getCons().stream().map(TbProskuCon::getId).collect(Collectors.toList()); + List collect = resources.getCons().stream().map(TbProskuConDto::getId).collect(Collectors.toList()); //现有的 List tbProskuCons = tbProskuConRepository.searchAllByProductId(resources.getProductId()); List delIds = new ArrayList<>(); @@ -186,7 +188,7 @@ public class TbProskuConServiceImpl implements TbProskuConService { } //判断 - for (TbProskuCon resource : resources.getCons()) { + for (TbProskuConDto resource : resources.getCons()) { TbConsInfo tbConsInfo = tbConsInfoRepository.findById(resource.getConInfoId()).orElseGet(TbConsInfo::new); if (ObjectUtil.isNull(tbConsInfo) || ObjectUtil.isNull(tbConsInfo.getId())) { throw new BadRequestException("对应的耗材信息不存在"); @@ -197,7 +199,9 @@ public class TbProskuConServiceImpl implements TbProskuConService { throw new BadRequestException("规格信息不存在"); } } - newCons.add(resource); + TbProskuCon tbConsInfo1 = new TbProskuCon(); + BeanUtil.copyProperties(tbConsInfo1,resource, CopyOptions.create().setIgnoreNullValue(true)); + newCons.add(tbConsInfo1); } if (!CollectionUtils.isEmpty(newCons)) { tbProskuConRepository.saveAll(newCons);