diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmQrBoxServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmQrBoxServiceImpl.java index 42e1e300..13579b74 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmQrBoxServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmQrBoxServiceImpl.java @@ -96,9 +96,10 @@ public class BmQrBoxServiceImpl implements BmQrBoxService { List boxBindList = bmQrBoxMapper.getBoxBindList(boxInfoBindVo.getBoxId()); boxBindList.removeIf(Objects::isNull); boxInfoBindVo.setBindMaTotal(boxBindList.size()); - boxBindList.removeIf(o -> o.getMaStatus() == null); - boxBindList.removeIf(info -> !info.getMaStatus().equals(MaMachineStatusEnum.IN_STORE.getStatus().toString()) && - !info.getMaStatus().equals(MaMachineStatusEnum.NEW_PURCHASE.getStatus().toString())); + boxBindList.removeIf(item -> item.getMaStatus() == null); + boxBindList.removeIf(item -> !item.getMaStatus().equals(MaMachineStatusEnum.IN_STORE.getStatus().toString()) && + !item.getMaStatus().equals(MaMachineStatusEnum.NEW_PURCHASE.getStatus().toString())); + boxBindList.removeIf(item -> item.getMaTypeId() == null || !Objects.equals(item.getMaTypeId(), bmQrBoxInfo.getMaTypeId())); boxInfoBindVo.setSuccessMaTotal(boxBindList.size()); return AjaxResult.success(boxInfoBindVo); }