|
|
|
@@ -1463,8 +1463,8 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
//如果是按自然月,则这一年和下一年交叉部分需要重新计算 |
|
|
|
if(wxRentContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_NAR_MONTH.getCode())) { |
|
|
|
Date currentYearRentDate = getCurrentYearRentDate(endDate,wxRentContract.getRentalStartDate()); |
|
|
|
needpayFront = getNeedPayMoney(wxRentContract, priceArrs[index - 1], endDate, currentYearRentDate, i, billTimeVoList.size(), saveDb, dayType, receivePeriod,true,true); |
|
|
|
needpayAfter = getNeedPayMoney(wxRentContract, priceArrs[index], DateUtils.getDaySet(currentYearRentDate, Calendar.DATE, 1), billTimeVo.getEndDate(), i, billTimeVoList.size(), saveDb, dayType, receivePeriod,true,true); |
|
|
|
needpayFront = getNeedPayMoney(wxRentContract, priceArrs[index - 1], endDate, DateUtils.getDaySet(currentYearRentDate, Calendar.DATE, -1), i, billTimeVoList.size(), saveDb, dayType, receivePeriod,true,true); |
|
|
|
needpayAfter = getNeedPayMoney(wxRentContract, priceArrs[index], currentYearRentDate, billTimeVo.getEndDate(), i, billTimeVoList.size(), saveDb, dayType, receivePeriod,true,true); |
|
|
|
}else { |
|
|
|
//按账单日 |
|
|
|
needpayFront = getNeedPayMoney(wxRentContract, priceArrs[index], billTimeVo.getStartDate(), billTimeVo.getEndDate(), i, billTimeVoList.size(), saveDb,dayType,receivePeriod,false,false); |
|
|
|
|