| @@ -143,10 +143,12 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| if (record.getStartDate().after(record.getRentalStartDate())) { | if (record.getStartDate().after(record.getRentalStartDate())) { | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_ERROR, "起租开始时间不能大于计租开始时间"); | return new ResultData(ErrorCode.SYS_PARAMETER_ERROR, "起租开始时间不能大于计租开始时间"); | ||||
| } | } | ||||
| int dayType = record.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_DAY.getCode()) ? Calendar.DAY_OF_MONTH : Calendar.MONTH; | |||||
| //计租开始时间 | //计租开始时间 | ||||
| Calendar instance = Calendar.getInstance(); | Calendar instance = Calendar.getInstance(); | ||||
| instance.setTime(record.getRentalStartDate()); | instance.setTime(record.getRentalStartDate()); | ||||
| instance.add(Calendar.MONTH, record.getLease()); | |||||
| instance.add(dayType, record.getLease()); | |||||
| instance.add(Calendar.DAY_OF_MONTH, -1); | instance.add(Calendar.DAY_OF_MONTH, -1); | ||||
| record.setRentalEndDate(instance.getTime()); | record.setRentalEndDate(instance.getTime()); | ||||
| //起租结束时间 | //起租结束时间 | ||||
| @@ -248,9 +250,11 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| if (wxRentContract == null) { | if (wxRentContract == null) { | ||||
| return new ResultData(ErrorCode.RENT_CONTRACT_IS_NOT_FOUND); | return new ResultData(ErrorCode.RENT_CONTRACT_IS_NOT_FOUND); | ||||
| } | } | ||||
| int dayType = wxRentContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_DAY.getCode()) ? Calendar.DAY_OF_MONTH : Calendar.MONTH; | |||||
| Calendar instance = Calendar.getInstance(); | Calendar instance = Calendar.getInstance(); | ||||
| instance.setTime(record.getRentalStartDate()); | instance.setTime(record.getRentalStartDate()); | ||||
| instance.add(Calendar.MONTH, record.getLease()); | |||||
| instance.add(dayType, record.getLease()); | |||||
| instance.add(Calendar.DAY_OF_MONTH, -1); | instance.add(Calendar.DAY_OF_MONTH, -1); | ||||
| record.setRentalEndDate(instance.getTime()); | record.setRentalEndDate(instance.getTime()); | ||||
| @@ -316,7 +320,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| wxBillDeposit.setNeedPay(needpay); | wxBillDeposit.setNeedPay(needpay); | ||||
| wxBillDeposit.setOwe(needpay); | wxBillDeposit.setOwe(needpay); | ||||
| //找到计租方式 | //找到计租方式 | ||||
| int dayType = wxRentContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_MONTH.getCode()) ? Calendar.DAY_OF_MONTH : Calendar.MONTH; | |||||
| int dayType = wxRentContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_DAY.getCode()) ? Calendar.DAY_OF_MONTH : Calendar.MONTH; | |||||
| Date date = new Date(); | Date date = new Date(); | ||||
| Calendar instance = Calendar.getInstance(); | Calendar instance = Calendar.getInstance(); | ||||