|
|
|
@@ -466,11 +466,17 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService |
|
|
|
|
|
|
|
WxRentContract wxRentContract = wxRentContractMapper.selectByPrimaryKey(rentContractId); |
|
|
|
if (wxRentContract != null) { |
|
|
|
if (wxRentContract.getStatus().equals(EnumRentContractStatus.CONTRACT_END.getCode()) || |
|
|
|
wxRentContract.getStatus().equals(EnumRentContractStatus.CONTRACT_TERMINATE.getCode()) || |
|
|
|
wxRentContract.getStatus().equals(EnumRentContractStatus.WAIT_SIGN.getCode()) || |
|
|
|
wxRentContract.getStatus().equals(EnumRentContractStatus.INVALID.getCode())) { |
|
|
|
return new ResultData(true); |
|
|
|
WxPropertyContract wxPropertyContract = new WxPropertyContract(); |
|
|
|
wxPropertyContract.setTenantId(wxRentContract.getTenantId()); |
|
|
|
wxPropertyContract.setShopId(wxRentContract.getShopId()); |
|
|
|
List<WxPropertyContract> select = wxPropertyContractMapper.select(wxPropertyContract); |
|
|
|
if (select.size() > 0) { |
|
|
|
long count = select.stream().filter(propertyContract -> propertyContract.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode()) || |
|
|
|
propertyContract.getStatus().equals(EnumRentContractStatus.RENT_PAID.getCode()) || |
|
|
|
propertyContract.getStatus().equals(EnumRentContractStatus.CONTRACT_END_SOON.getCode())).count(); |
|
|
|
if (count > 0) { |
|
|
|
return new ResultData(true); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
return new ResultData(false); |
|
|
|
|