| @@ -262,6 +262,8 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||||
| wxRentContract.getStatus().equals(EnumRentContractStatus.INVALID.getCode())) { | wxRentContract.getStatus().equals(EnumRentContractStatus.INVALID.getCode())) { | ||||
| return new ResultData(ErrorCode.RENT_CONTRACT_IS_TERMINATED); | return new ResultData(ErrorCode.RENT_CONTRACT_IS_TERMINATED); | ||||
| } | } | ||||
| } else { | |||||
| return new ResultData(ErrorCode.RENT_CONTRACT_IS_NOT_FOUND); | |||||
| } | } | ||||
| if (null == record.getMerchantId() && record.getOperationType().equals(EnumContractOperationType.PART.getCode())) { | if (null == record.getMerchantId() && record.getOperationType().equals(EnumContractOperationType.PART.getCode())) { | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "merchantId不能为空"); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "merchantId不能为空"); | ||||
| @@ -365,7 +367,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||||
| return new ResultData(ErrorCode.PROPERTY_CONTRACT_IS_NOT_FOUND); | return new ResultData(ErrorCode.PROPERTY_CONTRACT_IS_NOT_FOUND); | ||||
| } | } | ||||
| record.setRentalStartDate(wxPropertyContract.getRentalStartDate()); | |||||
| record.setRentalStartDate(wxRentContract.getRentalStartDate()); | |||||
| record.setRentalEndDate(wxRentContract.getRentalEndDate()); | record.setRentalEndDate(wxRentContract.getRentalEndDate()); | ||||
| record.setStartDate(wxRentContract.getStartDate()); | record.setStartDate(wxRentContract.getStartDate()); | ||||
| record.setEndDate(wxRentContract.getEndDate()); | record.setEndDate(wxRentContract.getEndDate()); | ||||