|
|
@@ -734,8 +734,8 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
int paycount = lease / receivePeriod + extracount; |
|
|
int paycount = lease / receivePeriod + extracount; |
|
|
int index = paycount - 1; |
|
|
int index = paycount - 1; |
|
|
final IdWorker idWorker = IdWorker.get(); |
|
|
final IdWorker idWorker = IdWorker.get(); |
|
|
//自然月,周期为一个月 n+1 |
|
|
|
|
|
if(wxRentContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_NAR_MONTH.getCode()) && receivePeriod <= 1){ |
|
|
|
|
|
|
|
|
//自然月 n+1 |
|
|
|
|
|
if(wxRentContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_NAR_MONTH.getCode())){ |
|
|
paycount ++; |
|
|
paycount ++; |
|
|
} |
|
|
} |
|
|
for (int i = 0; i < paycount; i++) { |
|
|
for (int i = 0; i < paycount; i++) { |
|
|
@@ -829,12 +829,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
|
|
|
|
|
double needPayDouble; |
|
|
double needPayDouble; |
|
|
double oneDayProce = (double) price/DateUtils.getMonthDayCount(wxBillRent.getEndtime()); |
|
|
double oneDayProce = (double) price/DateUtils.getMonthDayCount(wxBillRent.getEndtime()); |
|
|
if(receivePeriod <= 1) {//周期为一个月 |
|
|
|
|
|
needPayDouble = oneDayProce * endDateInt; |
|
|
|
|
|
}else{ |
|
|
|
|
|
needPayDouble = price * (extralease-1); |
|
|
|
|
|
needPayDouble += oneDayProce * endDateInt; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
needPayDouble = oneDayProce * endDateInt; |
|
|
DecimalFormat format = new DecimalFormat("0"); |
|
|
DecimalFormat format = new DecimalFormat("0"); |
|
|
needpay = Integer.parseInt(format.format(needPayDouble)); //分做四舍五入 |
|
|
needpay = Integer.parseInt(format.format(needPayDouble)); //分做四舍五入 |
|
|
} |
|
|
} |
|
|
|