| @@ -1802,17 +1802,20 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| Double total = new Double(0); | Double total = new Double(0); | ||||
| int[] diff; | int[] diff; | ||||
| //同月 | |||||
| if(sdM.format(start).equals(sdM.format(end))){ | |||||
| diff = DateUtils.getDiff(start,end); | |||||
| int dayCount = DateUtils.getMonthDayCount(start); | |||||
| total += (diff[1]+1) * (price/dayCount); | |||||
| return total; | |||||
| } | |||||
| //第一个月 | //第一个月 | ||||
| Date lastMonthDay = DateUtils.getLastDayForMonth(start); | Date lastMonthDay = DateUtils.getLastDayForMonth(start); | ||||
| diff = DateUtils.getDiff(start,lastMonthDay); | diff = DateUtils.getDiff(start,lastMonthDay); | ||||
| int dayCount = DateUtils.getMonthDayCount(start); | int dayCount = DateUtils.getMonthDayCount(start); | ||||
| total += (diff[1]+1) * (price/dayCount); | total += (diff[1]+1) * (price/dayCount); | ||||
| //同月 | |||||
| if(sdM.format(start).equals(sdM.format(end))){ | |||||
| return total; | |||||
| } | |||||
| //中间月份 | //中间月份 | ||||
| Date newStartDate = DateUtils.getDaySet(lastMonthDay,Calendar.DATE,1); | Date newStartDate = DateUtils.getDaySet(lastMonthDay,Calendar.DATE,1); | ||||
| int months = getMonths(sdM.format(newStartDate)+"-01",sdM.format(end)+"-01"); | int months = getMonths(sdM.format(newStartDate)+"-01",sdM.format(end)+"-01"); | ||||