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); }