|
|
@@ -961,7 +961,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
SimpleDateFormat sdM = new SimpleDateFormat("yyyy-MM"); |
|
|
SimpleDateFormat sdM = new SimpleDateFormat("yyyy-MM"); |
|
|
if(i == 0){//第一期 |
|
|
|
|
|
|
|
|
if(i == billTimeVoList.size()-1){//最后 |
|
|
|
|
|
needpay = new Double(getMonthNeedPay(priceD,billTimeVo.getStartDate(),billTimeVo.getEndDate())).longValue(); |
|
|
|
|
|
}else if(i == 0){//第一期 |
|
|
if(wxRentContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_NAR_MONTH.getCode())){ |
|
|
if(wxRentContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_NAR_MONTH.getCode())){ |
|
|
if(isFirstDay(billTimeVo.getStartDate())){ |
|
|
if(isFirstDay(billTimeVo.getStartDate())){ |
|
|
int months = getMonths(sdM.format(billTimeVo.getStartDate())+"-01",sdM.format(billTimeVo.getEndDate())+"-01"); |
|
|
int months = getMonths(sdM.format(billTimeVo.getStartDate())+"-01",sdM.format(billTimeVo.getEndDate())+"-01"); |
|
|
@@ -981,8 +983,6 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
needpay = new Double(getMonthNeedPay(priceD, billTimeVo.getStartDate(), billTimeVo.getEndDate())).longValue(); |
|
|
needpay = new Double(getMonthNeedPay(priceD, billTimeVo.getStartDate(), billTimeVo.getEndDate())).longValue(); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
}else if(i == billTimeVoList.size()-1){//最后 |
|
|
|
|
|
needpay = new Double(getMonthNeedPay(priceD,billTimeVo.getStartDate(),billTimeVo.getEndDate())).longValue(); |
|
|
|
|
|
}else{//中间 |
|
|
}else{//中间 |
|
|
int months = getMonths(sdM.format(billTimeVo.getStartDate())+"-01",sdM.format(billTimeVo.getEndDate())+"-01"); |
|
|
int months = getMonths(sdM.format(billTimeVo.getStartDate())+"-01",sdM.format(billTimeVo.getEndDate())+"-01"); |
|
|
if(isFirstDay(billTimeVo.getStartDate())){ |
|
|
if(isFirstDay(billTimeVo.getStartDate())){ |
|
|
@@ -2013,3 +2013,4 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|