From f9cce25f3ef7551a137d72cce569656bf29365c0 Mon Sep 17 00:00:00 2001 From: mashuai Date: Thu, 26 Dec 2024 15:32:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/common/biz/aspect/StoreLogAspect.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/aspect/StoreLogAspect.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/aspect/StoreLogAspect.java index 410ca0b4..aa665d7a 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/aspect/StoreLogAspect.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/aspect/StoreLogAspect.java @@ -168,12 +168,14 @@ public class StoreLogAspect { bmStorageLog.setPreStoreNum(leaseOutDetails.getPreStoreNum()); bmStorageLog.setOutNum(BigDecimal.valueOf(lod.getLeaseOutDetailsList().size())); bmStorageLog.setPostStoreNum(leaseOutDetails.getPreStoreNum().subtract(bmStorageLog.getOutNum())); - if (leaseOutDetails.getManageType().equals(MaTypeManageTypeEnum.CODE_DEVICE.getTypeId())) { + if (leaseOutDetails.getOutType() != null) { + if (leaseOutDetails.getOutType().equals(InputOutEnum.STANDARD_BOX.getTypeId())) { + bmStorageLog.setOutType(InputOutEnum.STANDARD_BOX.getTypeId()); + } else if (leaseOutDetails.getOutType().equals(InputOutEnum.QR_CODE.getTypeId())) { + bmStorageLog.setOutType(InputOutEnum.QR_CODE.getTypeId()); + } + } else if (leaseOutDetails.getManageType().equals(MaTypeManageTypeEnum.CODE_DEVICE.getTypeId())) { bmStorageLog.setOutType(InputOutEnum.CODE_DEVICE.getTypeId()); - } else if (leaseOutDetails.getOutType().equals(InputOutEnum.STANDARD_BOX.getTypeId())) { - bmStorageLog.setOutType(InputOutEnum.STANDARD_BOX.getTypeId()); - } else if (leaseOutDetails.getOutType().equals(InputOutEnum.QR_CODE.getTypeId())) { - bmStorageLog.setOutType(InputOutEnum.QR_CODE.getTypeId()); } bmStorageLogList.add(bmStorageLog); }