diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 918c38bf4..6f84051c0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -141,6 +141,17 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService return new ResultData(ErrorCode.SYS_PARAMETER_ERROR, "押金要大于0"); } + WxPropertyContract propertyContract = new WxPropertyContract(); + propertyContract.setTenantId(record.getTenantId()); + propertyContract.setRentContractId(record.getRentContractId()); + long count = wxPropertyContractMapper.findList(propertyContract) + .stream().filter(p -> p.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode()) || + p.getStatus().equals(EnumRentContractStatus.RENT_PAID.getCode()) || + p.getStatus().equals(EnumRentContractStatus.CONTRACT_END_SOON.getCode())).count(); + if (count > 0) { + return new ResultData(ErrorCode.RENT_CONTRACT_WITH_SHOP_IS_FOUND); + } + //保存物业合同信息 if (record.getId() == null) { final IdWorker idWorker = IdWorker.get();