| @@ -1044,8 +1044,15 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| }else{ | }else{ | ||||
| //如果是计算账单金额&cross 拆分日期进行计算 | //如果是计算账单金额&cross 拆分日期进行计算 | ||||
| if(!saveDb && billTimeVo.getEndDate().after(endDate)) { | if(!saveDb && billTimeVo.getEndDate().after(endDate)) { | ||||
| long needpayFront = getNeedPayMoney(wxRentContract,priceArrs[index-1],billTimeVo.getStartDate(),endDate,i,billTimeVoList.size(),saveDb); | |||||
| long needpayAfter = getNeedPayMoney(wxRentContract,priceArrs[index],endDate,billTimeVo.getEndDate(),i,billTimeVoList.size(),saveDb); | |||||
| 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{ | |||||
| needpayFront = getNeedPayMoney(wxRentContract,priceArrs[index-1],billTimeVo.getStartDate(),endDate,i,billTimeVoList.size(),saveDb); | |||||
| needpayAfter = getNeedPayMoney(wxRentContract,priceArrs[index],endDate,billTimeVo.getEndDate(),i,billTimeVoList.size(),saveDb); | |||||
| } | |||||
| System.out.println(); | System.out.println(); | ||||
| needpay = needpayFront+needpayAfter; | needpay = needpayFront+needpayAfter; | ||||
| flag = true; | flag = true; | ||||