|
|
|
@@ -1036,6 +1036,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
for (int i = 0; i < years; i++) {
|
|
|
|
Calendar instance = Calendar.getInstance();
|
|
|
|
instance.setTime(rentalStartDate);
|
|
|
|
instance.set(Calendar.MILLISECOND, 0);
|
|
|
|
instance.add(Calendar.MONTH, month * i);
|
|
|
|
Date startDate = instance.getTime();
|
|
|
|
if (null != endContractTime && endContractTime.before(startDate)) {
|
|
|
|
@@ -1900,12 +1901,14 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
while (true) {
|
|
|
|
BillTimeVo timeVo = new BillTimeVo();
|
|
|
|
|
|
|
|
//开始时间
|
|
|
|
timeVo.setStartDate(start);
|
|
|
|
|
|
|
|
//账单日
|
|
|
|
//账单日
|
|
|
|
Calendar instance = Calendar.getInstance();
|
|
|
|
instance.setTime(start);
|
|
|
|
instance.set(Calendar.MILLISECOND, 0);
|
|
|
|
//开始时间
|
|
|
|
timeVo.setStartDate(instance.getTime());
|
|
|
|
|
|
|
|
|
|
|
|
if(!adjustPeriod.equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_NAR_MONTH.getCode())){
|
|
|
|
instance.add(Calendar.DATE, -1);
|
|
|
|
}
|
|
|
|
@@ -1923,9 +1926,6 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
if(adjustPeriod.equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_NAR_MONTH.getCode())){
|
|
|
|
timeVo.setEndDate(EnumContractReceivePeriodUnit.getAfterCalendarNarDay(timeVo.getStartDate(), receivePeriod, dayType));
|
|
|
|
}
|
|
|
|
if (count >= 12) {
|
|
|
|
String a = "";
|
|
|
|
}
|
|
|
|
|
|
|
|
//如果是到了每年的截止时间,第一年忽略(是开始时间)
|
|
|
|
boolean isYearCut = false;//是不是有截断
|
|
|
|
|