|
|
|
@@ -1031,33 +1031,47 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
//计算金额 |
|
|
|
long needpay = 0; |
|
|
|
|
|
|
|
boolean flag = false; |
|
|
|
if(yearList.size() > 1) { |
|
|
|
if (endDate!=null && (sd.format(billTimeVo.getStartDate()).equals(sd.format(endDate)) || billTimeVo.getStartDate().after(endDate) || billTimeVo.getEndDate().after(endDate) )) { |
|
|
|
logger.info("=====billTimeVo.getStartDate():"+sd.format(billTimeVo.getStartDate())+" endDate:"+sd.format(endDate)); |
|
|
|
|
|
|
|
index++; |
|
|
|
if(index >= yearList.size()-1){ |
|
|
|
endDate = null; |
|
|
|
}else{ |
|
|
|
endDate = yearList.get(index+1);//price index 0开始,year.end 从第二年开始 |
|
|
|
logger.info("==========cross:"+sd.format(endDate)); |
|
|
|
|
|
|
|
//如果是计算账单金额&cross 拆分日期进行计算 |
|
|
|
if(!saveDb) { |
|
|
|
logger.info("==========s:"+sd.format(billTimeVo.getStartDate())); |
|
|
|
logger.info("==========e:"+sd.format(billTimeVo.getEndDate())); |
|
|
|
logger.info("==========:"+sd.format(endDate)); |
|
|
|
long needpayFront = getNeedPayMoney(wxRentContract,priceArrs[index-1],billTimeVo.getStartDate(),billTimeVo.getEndDate(),i,billTimeVoList.size()); |
|
|
|
long needpayAfter = getNeedPayMoney(wxRentContract,priceArrs[index],billTimeVo.getStartDate(),billTimeVo.getEndDate(),i,billTimeVoList.size()); |
|
|
|
needpay = needpayFront+needpayAfter; |
|
|
|
}else{ |
|
|
|
//计算金额 |
|
|
|
needpay = getNeedPayMoney(wxRentContract,priceArrs[index],billTimeVo.getStartDate(),billTimeVo.getEndDate(),i,billTimeVoList.size()); |
|
|
|
if(yearList.size() > 1) { |
|
|
|
if (endDate!=null && (sd.format(billTimeVo.getStartDate()).equals(sd.format(endDate)) || billTimeVo.getStartDate().after(endDate) || billTimeVo.getEndDate().after(endDate) )) { |
|
|
|
//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)) { |
|
|
|
logger.info("==========s:"+sd.format(billTimeVo.getStartDate())); |
|
|
|
logger.info("==========e:"+sd.format(billTimeVo.getEndDate())); |
|
|
|
logger.info("==========endDate:"+sd.format(endDate)); |
|
|
|
|
|
|
|
long needpayFront = getNeedPayMoney(wxRentContract,priceArrs[index-1],billTimeVo.getStartDate(),DateUtils.getDaySet(endDate,Calendar.DATE,-1),i,billTimeVoList.size()); |
|
|
|
long needpayAfter = getNeedPayMoney(wxRentContract,priceArrs[index],endDate,billTimeVo.getEndDate(),i,billTimeVoList.size()); |
|
|
|
logger.info("==========needpayFront:"+needpayFront); |
|
|
|
logger.info("==========needpayAfter:"+needpayAfter); |
|
|
|
System.out.println(); |
|
|
|
needpay = needpayFront+needpayAfter; |
|
|
|
flag = true; |
|
|
|
} |
|
|
|
|
|
|
|
endDate = yearList.get(index+1);//price index 0开始,year.end 从第二年开始 |
|
|
|
//logger.info("==========cross:"+sd.format(endDate)); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
//计算金额 |
|
|
|
if(!flag){ |
|
|
|
needpay = getNeedPayMoney(wxRentContract, priceArrs[index], billTimeVo.getStartDate(), billTimeVo.getEndDate(), i, billTimeVoList.size()); |
|
|
|
} |
|
|
|
|
|
|
|
WxBillRent wxBillRent = new WxBillRent(); |
|
|
|
wxBillRent.setIsPreview(isPreview); |
|
|
|
wxBillRent.setId(idWorker.nextId()); |
|
|
|
|