|
|
|
@@ -546,7 +546,7 @@ public class WxRentContractController extends WxContractBaseController { |
|
|
|
|
|
|
|
WxRentContract rentContract = wxRentContractMapper.selectById(wxRentContract.getId()); |
|
|
|
if (null == rentContract) { |
|
|
|
return new ResultData(Result.ERROR, "编号["+wxRentContract.getId()+"]未找到租金合同"); |
|
|
|
return new ResultData(Result.ERROR, "未找到租金合同"); |
|
|
|
} |
|
|
|
|
|
|
|
if (!(rentContract.getRentalEndDate().before(wxRentContract.getRentalStartDate()))) { |
|
|
|
@@ -609,43 +609,16 @@ public class WxRentContractController extends WxContractBaseController { |
|
|
|
return new ResultData(Result.ERROR, "编号["+wxRentContract.getId()+"]未找到租金合同"); |
|
|
|
} |
|
|
|
|
|
|
|
if (rentContract.getOperationType().intValue() == EnumContractOperationType.WHOLE.getCode().intValue()) { |
|
|
|
if (null == wxRentContract.getPropertyId()) { |
|
|
|
return new ResultData(Result.ERROR,"未创建物业合同,请先完善。"); |
|
|
|
} |
|
|
|
WxPropertyContract property = wxPropertyContractService.getSimpleDetail(wxRentContract.getPropertyId()); |
|
|
|
if (null == property) { |
|
|
|
return new ResultData(Result.ERROR,"未创建物业合同,请先完善。"); |
|
|
|
} |
|
|
|
if (property.getStatus().intValue() == EnumRentContractStatus.UNWRITE.getCode().intValue()) { |
|
|
|
return new ResultData(Result.ERROR,"物业合同未完善,请先完善。"); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
MallUserInfo user = getUser(); |
|
|
|
|
|
|
|
rentContract.setRentalStartDate(wxRentContract.getRentalStartDate()); |
|
|
|
rentContract.setRentalEndDate(wxRentContract.getRentalEndDate()); |
|
|
|
rentContract.setSignDate(wxRentContract.getSignDate()); |
|
|
|
rentContract.setStartDate(wxRentContract.getStartDate()); |
|
|
|
rentContract.setEndDate(wxRentContract.getStartDate()); |
|
|
|
rentContract.setFixStartDate(wxRentContract.getFixStartDate()); |
|
|
|
rentContract.setFixEndDate(wxRentContract.getFixEndDate()); |
|
|
|
|
|
|
|
try { |
|
|
|
rentContractValidShop(rentContract); |
|
|
|
} catch (Exception e) { |
|
|
|
return new ResultData(Result.ERROR,e.getMessage()); |
|
|
|
} |
|
|
|
|
|
|
|
try { |
|
|
|
wxRentContractService.renewal(rentContract,user); |
|
|
|
wxRentContractService.transfer(rentContract,user); |
|
|
|
}catch(Exception e) { |
|
|
|
logger.error("renewal error.",e); |
|
|
|
logger.error("transfer error.",e); |
|
|
|
return new ResultData(Result.ERROR,e.getMessage()); |
|
|
|
} |
|
|
|
|
|
|
|
return new ResultData(); |
|
|
|
return new ResultData(rentContract); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|