|
|
|
@@ -1040,28 +1040,28 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
//logger.info("=====billTimeVo.getStartDate():"+sd.format(billTimeVo.getStartDate())+" endDate:"+sd.format(endDate)); |
|
|
|
|
|
|
|
index++; |
|
|
|
if(index >= yearList.size()-1){ |
|
|
|
endDate = null; |
|
|
|
}else{ |
|
|
|
//如果是计算账单金额&cross 拆分日期进行计算 |
|
|
|
if(!saveDb && billTimeVo.getEndDate().after(endDate)) { |
|
|
|
long needpayFront = 0; |
|
|
|
long needpayAfter = 0; |
|
|
|
//同一天,算一天 |
|
|
|
if(sd.format(billTimeVo.getStartDate()).equals(sd.format(billTimeVo.getEndDate()))){ |
|
|
|
needpayFront = getNeedPayMoney(wxRentContract,priceArrs[index-1],billTimeVo.getStartDate(),endDate,i,billTimeVoList.size(),saveDb); |
|
|
|
|
|
|
|
//如果是计算账单金额&cross 拆分日期进行计算 |
|
|
|
if(!saveDb && billTimeVo.getEndDate().after(endDate)) { |
|
|
|
long needpayFront = 0; |
|
|
|
long needpayAfter = 0; |
|
|
|
//同一天,算一天 |
|
|
|
if(sd.format(billTimeVo.getStartDate()).equals(sd.format(billTimeVo.getEndDate()))){ |
|
|
|
needpayFront = getNeedPayMoney(wxRentContract,priceArrs[index-1],billTimeVo.getStartDate(),endDate,i,billTimeVoList.size(),saveDb); |
|
|
|
}else{ |
|
|
|
if(billTimeVo.getStartDate().before(endDate)){ |
|
|
|
needpayFront = getNeedPayMoney(wxRentContract, priceArrs[index - 1], billTimeVo.getStartDate(), DateUtils.getDaySet(endDate,Calendar.DATE,-1), i, billTimeVoList.size(), saveDb); |
|
|
|
needpayAfter = getNeedPayMoney(wxRentContract, priceArrs[index], endDate, billTimeVo.getEndDate(), i, billTimeVoList.size(), saveDb); |
|
|
|
}else{ |
|
|
|
if(billTimeVo.getStartDate().before(endDate)){ |
|
|
|
needpayFront = getNeedPayMoney(wxRentContract, priceArrs[index - 1], billTimeVo.getStartDate(), DateUtils.getDaySet(endDate,Calendar.DATE,-1), i, billTimeVoList.size(), saveDb); |
|
|
|
needpayAfter = getNeedPayMoney(wxRentContract, priceArrs[index], endDate, billTimeVo.getEndDate(), i, billTimeVoList.size(), saveDb); |
|
|
|
}else{ |
|
|
|
needpayFront = getNeedPayMoney(wxRentContract, priceArrs[index], billTimeVo.getStartDate(), billTimeVo.getEndDate(), i, billTimeVoList.size(), saveDb); |
|
|
|
} |
|
|
|
needpayFront = getNeedPayMoney(wxRentContract, priceArrs[index], billTimeVo.getStartDate(), billTimeVo.getEndDate(), i, billTimeVoList.size(), saveDb); |
|
|
|
} |
|
|
|
needpay = needpayFront+needpayAfter; |
|
|
|
flag = true; |
|
|
|
} |
|
|
|
|
|
|
|
needpay = needpayFront+needpayAfter; |
|
|
|
flag = true; |
|
|
|
} |
|
|
|
if(index >= yearList.size()-1){ |
|
|
|
endDate = null; |
|
|
|
}else{ |
|
|
|
endDate = yearList.get(index+1);//price index 0开始,year.end 从第二年开始 |
|
|
|
//logger.info("==========cross:"+sd.format(endDate)); |
|
|
|
} |
|
|
|
|