|
|
|
@@ -968,13 +968,13 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
Date receiveDate = DateUtils.getFirstDayOfNextMonth(startdate,receivePeriod * i); |
|
|
|
wxBillRent.setReceiveDate(receiveDate); |
|
|
|
wxBillRent.setStarttime(receiveDate); |
|
|
|
wxBillRent.setEndtime(DateUtils.getLastDayForMonth(receiveDate,receivePeriod * i)); |
|
|
|
wxBillRent.setEndtime(DateUtils.getLastDayForMonth(wxBillRent.getStarttime(),receivePeriod * i)); |
|
|
|
|
|
|
|
instance.clear(); |
|
|
|
instance.setTime(receiveDate); |
|
|
|
instance.add(dayType, receivePeriod); |
|
|
|
instance.add(Calendar.DAY_OF_MONTH, -1); |
|
|
|
wxBillRent.setEndtime(instance.getTime()); |
|
|
|
// instance.clear(); |
|
|
|
// instance.setTime(receiveDate); |
|
|
|
// instance.add(dayType, receivePeriod); |
|
|
|
// instance.add(Calendar.DAY_OF_MONTH, -1); |
|
|
|
// wxBillRent.setEndtime(instance.getTime()); |
|
|
|
}else if(i == paycount - 1) {//最后周期 |
|
|
|
Date receiveDate = DateUtils.getFirstDayOfNextMonth(startdate,receivePeriod * i); |
|
|
|
wxBillRent.setReceiveDate(receiveDate); |
|
|
|
@@ -984,6 +984,13 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
instance.clear(); |
|
|
|
instance.setTime(firstDay); |
|
|
|
|
|
|
|
if(new SimpleDateFormat("yyyy-MM-dd").format(wxBillRent.getEndtime()).equals("2020-02-29")){ |
|
|
|
System.out.println( "-----------"+receivePeriod * i); |
|
|
|
System.out.println("-----------"+new SimpleDateFormat("yyyy-MM-dd").format(wxBillRent.getReceiveDate())); |
|
|
|
System.out.println("-----------"+new SimpleDateFormat("yyyy-MM-dd").format(wxBillRent.getEndtime())); |
|
|
|
System.out.println(); |
|
|
|
} |
|
|
|
|
|
|
|
//最后一期有余,加上残月,(不整除时,最后一个月有余,否则为0) |
|
|
|
if(isFirstDay(wxRentContract.getRentalStartDate())){ |
|
|
|
if(receivePeriod > 1) { |
|
|
|
|