czg_team/cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

商品 耗材 绑定关系 接口日志

Browse Source 
问题处理 不传规格id时 过滤
This commit is contained in:
wangw
2024-09-24 17:46:21 +08:00
parent 418e834fe3
commit d8841522ad
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
eladmin-system/src/main/java/cn/ysk/cashier/config/AppApiMethodAspect.java
View File

@@ -29,6 +29,7 @@ public class AppApiMethodAspect {
"cn.ysk.cashier.controller.* " + "cn.ysk.cashier.controller.* " +
"|| cn.ysk.cashier.controller.*.* " + "|| cn.ysk.cashier.controller.*.* " +
"|| cn.ysk.cashier.mnt.rest.* " + "|| cn.ysk.cashier.mnt.rest.* " +
"|| cn.ysk.cashier.cons.rest.* " +
"|| cn.ysk.cashier.system.rest.* " + "|| cn.ysk.cashier.system.rest.* " +
"|| cn.ysk.cashier.config.security.rest.*" + "|| cn.ysk.cashier.config.security.rest.*" +
").*(..))") ").*(..))")

1
eladmin-system/src/main/java/cn/ysk/cashier/cons/service/dto/TbProskuConDto.java
View File

@@ -38,6 +38,7 @@ public class TbProskuConDto implements Serializable {
private String status; private String status;
private BigDecimal lasterInStock; private BigDecimal lasterInStock;
private BigDecimal surplusStock;
/** 创建时间 */ /** 创建时间 */
private Timestamp createTime; private Timestamp createTime;

4
eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbProskuConServiceImpl.java
View File

@@ -189,6 +189,9 @@ public class TbProskuConServiceImpl implements TbProskuConService {
//判断 //判断
for (TbProskuConDto resource : resources.getCons()) { for (TbProskuConDto resource : resources.getCons()) {
if (resource.getConInfoId() == null) {
continue;
}
TbConsInfo tbConsInfo = tbConsInfoRepository.findById(resource.getConInfoId()).orElseGet(TbConsInfo::new); TbConsInfo tbConsInfo = tbConsInfoRepository.findById(resource.getConInfoId()).orElseGet(TbConsInfo::new);
if (ObjectUtil.isNull(tbConsInfo) || ObjectUtil.isNull(tbConsInfo.getId())) { if (ObjectUtil.isNull(tbConsInfo) || ObjectUtil.isNull(tbConsInfo.getId())) {
throw new BadRequestException("对应的耗材信息不存在"); throw new BadRequestException("对应的耗材信息不存在");
@@ -201,7 +204,6 @@ public class TbProskuConServiceImpl implements TbProskuConService {
} }
TbProskuCon tbConsInfo1 = new TbProskuCon(); TbProskuCon tbConsInfo1 = new TbProskuCon();
BeanUtil.copyProperties(resource,tbConsInfo1, CopyOptions.create().setIgnoreNullValue(true)); BeanUtil.copyProperties(resource,tbConsInfo1, CopyOptions.create().setIgnoreNullValue(true));
tbConsInfo1.setSurplusStock(resource.getLasterInStock());
newCons.add(tbConsInfo1); newCons.add(tbConsInfo1);
} }
if (!CollectionUtils.isEmpty(newCons)) { if (!CollectionUtils.isEmpty(newCons)) {