| @@ -1044,7 +1044,7 @@ 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(),DateUtils.getDaySet(endDate,Calendar.DATE,-1),i,billTimeVoList.size(),saveDb); | |||||
| 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 needpayAfter = getNeedPayMoney(wxRentContract,priceArrs[index],endDate,billTimeVo.getEndDate(),i,billTimeVoList.size(),saveDb); | ||||
| System.out.println(); | System.out.println(); | ||||
| needpay = needpayFront+needpayAfter; | needpay = needpayFront+needpayAfter; | ||||
| @@ -2015,6 +2015,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| //同月 | //同月 | ||||
| if(sdM.format(start).equals(sdM.format(end))){ | if(sdM.format(start).equals(sdM.format(end))){ | ||||
| System.out.println(sd.format(start)); | |||||
| System.out.println(sd.format(end)); | |||||
| diff = DateUtils.getDiff(start,end); | diff = DateUtils.getDiff(start,end); | ||||
| int dayCount = DateUtils.getMonthDayCount(start); | int dayCount = DateUtils.getMonthDayCount(start); | ||||
| total += (diff[1]+1) * (price/dayCount); | total += (diff[1]+1) * (price/dayCount); | ||||