| @@ -265,21 +265,25 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||
| if (record.getId() == null) { | |||
| final IdWorker idWorker = IdWorker.get(); | |||
| record.setId(idWorker.nextId()); | |||
| //计租开始时间 | |||
| Calendar instance = Calendar.getInstance(); | |||
| instance.setTime(record.getRentalStartDate()); | |||
| instance.add(dayType, record.getLease()); | |||
| instance.add(Calendar.DAY_OF_MONTH, -1); | |||
| record.setRentalEndDate(instance.getTime()); | |||
| //起租结束时间 | |||
| if(!record.getStartDate().equals(record.getRentalStartDate())){ | |||
| instance.clear(); | |||
| instance.setTime(record.getRentalStartDate()); | |||
| instance.add(Calendar.DAY_OF_MONTH, -1); | |||
| record.setEndDate(instance.getTime()); | |||
| }else{ | |||
| record.setEndDate(record.getStartDate()); | |||
| } | |||
| // //计租开始时间 | |||
| // Calendar instance = Calendar.getInstance(); | |||
| // instance.setTime(record.getRentalStartDate()); | |||
| // instance.add(dayType, record.getLease()); | |||
| // instance.add(Calendar.DAY_OF_MONTH, -1); | |||
| // record.setRentalEndDate(instance.getTime()); | |||
| // //起租结束时间 | |||
| // if(!record.getStartDate().equals(record.getRentalStartDate())){ | |||
| // instance.clear(); | |||
| // instance.setTime(record.getRentalStartDate()); | |||
| // instance.add(Calendar.DAY_OF_MONTH, -1); | |||
| // record.setEndDate(instance.getTime()); | |||
| // }else{ | |||
| // record.setEndDate(record.getStartDate()); | |||
| // } | |||
| record.setRentalStartDate(wxRentContract.getRentalStartDate()); | |||
| record.setRentalEndDate(wxRentContract.getRentalEndDate()); | |||
| record.setStartDate(wxRentContract.getStartDate()); | |||
| record.setEndDate(wxRentContract.getEndDate()); | |||
| Date date = new Date(); | |||
| record.setCreatetime(date); | |||
| record.setUpdatetime(date); | |||
| @@ -304,20 +308,24 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||
| if (wxPropertyContract == null) { | |||
| return new ResultData(ErrorCode.PROPERTY_CONTRACT_IS_NOT_FOUND); | |||
| } | |||
| Calendar instance = Calendar.getInstance(); | |||
| instance.setTime(record.getRentalStartDate()); | |||
| instance.add(dayType, record.getLease()); | |||
| instance.add(Calendar.DAY_OF_MONTH, -1); | |||
| record.setRentalEndDate(instance.getTime()); | |||
| //起租结束时间 | |||
| if(!record.getStartDate().equals(record.getRentalStartDate())){ | |||
| instance.clear(); | |||
| instance.setTime(record.getRentalStartDate()); | |||
| instance.add(Calendar.DAY_OF_MONTH, -1); | |||
| record.setEndDate(instance.getTime()); | |||
| }else{ | |||
| record.setEndDate(record.getStartDate()); | |||
| } | |||
| // Calendar instance = Calendar.getInstance(); | |||
| // instance.setTime(record.getRentalStartDate()); | |||
| // instance.add(dayType, record.getLease()); | |||
| // instance.add(Calendar.DAY_OF_MONTH, -1); | |||
| // record.setRentalEndDate(instance.getTime()); | |||
| // //起租结束时间 | |||
| // if(!record.getStartDate().equals(record.getRentalStartDate())){ | |||
| // instance.clear(); | |||
| // instance.setTime(record.getRentalStartDate()); | |||
| // instance.add(Calendar.DAY_OF_MONTH, -1); | |||
| // record.setEndDate(instance.getTime()); | |||
| // }else{ | |||
| // record.setEndDate(record.getStartDate()); | |||
| // } | |||
| record.setRentalStartDate(wxRentContract.getRentalStartDate()); | |||
| record.setRentalEndDate(wxRentContract.getRentalEndDate()); | |||
| record.setStartDate(wxRentContract.getStartDate()); | |||
| record.setEndDate(wxRentContract.getEndDate()); | |||
| record.setPrice(record.getPrice() != null ? record.getPrice() : 0); | |||
| record.setDeposit(record.getDeposit() != null ? record.getDeposit() : 0); | |||
| record.setUpdatetime(new Date()); | |||