|
|
|
@@ -652,9 +652,15 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService |
|
|
|
}else{ |
|
|
|
//如果是计算账单金额&cross 拆分日期进行计算 |
|
|
|
if(!saveDb && billTimeVo.getEndDate().after(endDate)) { |
|
|
|
long needpayFront = getNeedPayMoney(wxPropertyContract,priceArrs[index-1],billTimeVo.getStartDate(),DateUtils.getDaySet(endDate,Calendar.DATE,-1),i,billTimeVoList.size(),saveDb); |
|
|
|
long needpayAfter = getNeedPayMoney(wxPropertyContract,priceArrs[index],endDate,billTimeVo.getEndDate(),i,billTimeVoList.size(),saveDb); |
|
|
|
System.out.println(); |
|
|
|
long needpayFront = 0; |
|
|
|
long needpayAfter = 0; |
|
|
|
//同一天,算一天 |
|
|
|
if(sd.format(billTimeVo.getStartDate()).equals(sd.format(billTimeVo.getEndDate()))){ |
|
|
|
needpayFront = getNeedPayMoney(wxPropertyContract,priceArrs[index-1],billTimeVo.getStartDate(),endDate,i,billTimeVoList.size(),saveDb); |
|
|
|
}else{ |
|
|
|
needpayFront = getNeedPayMoney(wxPropertyContract,priceArrs[index-1],billTimeVo.getStartDate(),endDate,i,billTimeVoList.size(),saveDb); |
|
|
|
needpayAfter = getNeedPayMoney(wxPropertyContract,priceArrs[index],endDate,billTimeVo.getEndDate(),i,billTimeVoList.size(),saveDb); |
|
|
|
} |
|
|
|
needpay = needpayFront+needpayAfter; |
|
|
|
flag = true; |
|
|
|
} |
|
|
|
|