From 2cfd4739814a8b696dda699a86d2640faceba265 Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Fri, 20 Dec 2024 14:03:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E6=A0=87=E5=87=86?= =?UTF-8?q?=E7=AE=B1=E5=AE=8C=E5=96=84=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/basic/service/impl/BmQrBoxServiceImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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); }