|
|
|
@@ -2066,7 +2066,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
//最后一个月 |
|
|
|
diff = DateUtils.getDiff(DateUtils.getFirstDayForCurrMonth(end),end); |
|
|
|
dayCount = DateUtils.getMonthDayCount(end); |
|
|
|
total += (diff[1]+1) * (price/dayCount); |
|
|
|
total += (diff[1]) * (price/dayCount); |
|
|
|
return total; |
|
|
|
} |
|
|
|
|
|
|
|
@@ -2126,12 +2126,12 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
//最后一个月 |
|
|
|
if(sdM.format(monthStartDate).equals(sdM.format(end))){ |
|
|
|
diff = DateUtils.getDiff(monthStartDate,end); |
|
|
|
total += price * (diff[1] +1); |
|
|
|
total += price * (diff[1]); |
|
|
|
break; |
|
|
|
}else{ |
|
|
|
currEnd = DateUtils.getLastDayForMonth(monthStartDate); |
|
|
|
diff = DateUtils.getDiff(monthStartDate,currEnd); |
|
|
|
total += price * (diff[1] +1); |
|
|
|
total += price * (diff[1]); |
|
|
|
} |
|
|
|
|
|
|
|
//预警 |
|
|
|
|