|
|
|
@@ -559,11 +559,11 @@ public class WxRentContractHelper { |
|
|
|
if (newStartDate.before(end)) { |
|
|
|
List<Date> lastValidDays = getValidDays(newStartDate,end,freeDays); |
|
|
|
if (null == lastValidDays || lastValidDays.size() <= 0 ) { |
|
|
|
return "0"; |
|
|
|
}else { |
|
|
|
NeedPayDTO enp = getCurrentMonthPay(newStartDate, end, price, decimalSize, lastValidDays, dayPriceCalcute, monthAvageDays); |
|
|
|
total = total.add(enp.getMoney()); |
|
|
|
System.out.println("末月>>>>"+DateUtils.date2String(newStartDate)+">>>"+DateUtils.date2String(end)+">>>>"+enp.getMoney().toPlainString()); |
|
|
|
} |
|
|
|
NeedPayDTO enp = getCurrentMonthPay(newStartDate, end, price, decimalSize, lastValidDays, dayPriceCalcute, monthAvageDays); |
|
|
|
total = total.add(enp.getMoney()); |
|
|
|
System.out.println("末月>>>>"+DateUtils.date2String(newStartDate)+">>>"+DateUtils.date2String(end)+">>>>"+enp.getMoney().toPlainString()); |
|
|
|
} |
|
|
|
return total.toPlainString(); |
|
|
|
} |
|
|
|
|