|
|
|
@@ -743,14 +743,18 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService |
|
|
|
return needpay; |
|
|
|
} |
|
|
|
|
|
|
|
SimpleDateFormat sdMR = new SimpleDateFormat("MM-dd"); |
|
|
|
SimpleDateFormat sdM = new SimpleDateFormat("yyyy-MM"); |
|
|
|
SimpleDateFormat sdD = new SimpleDateFormat("d"); |
|
|
|
SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd"); |
|
|
|
|
|
|
|
if(i == billTimeVoListSize - 1){//最后 |
|
|
|
if(sdMR.format(startDate).equals(sdMR.format(wxRentContract.getStartDate())) && sdMR.format(endDate).equals(sdMR.format(wxRentContract.getEndDate())) ){ |
|
|
|
int months = WxRentContractServiceImpl.getMonths(sdM.format(startDate)+"-01",sdM.format(endDate)+"-01"); |
|
|
|
months++; |
|
|
|
//判断是否满足整月 |
|
|
|
int startInt = Integer.parseInt(sdD.format(startDate)); |
|
|
|
int endInt = Integer.parseInt(sdD.format(DateUtils.getDaySet(endDate,Calendar.DATE,1))); |
|
|
|
if(startInt == endInt){ |
|
|
|
int months = WxRentContractServiceImpl.getMonths(sdM.format(startDate)+"-01",sdM.format(DateUtils.getDaySet(endDate,Calendar.DATE,1))+"-01"); |
|
|
|
needpay = new Double(months * priceD).longValue(); |
|
|
|
}else { |
|
|
|
}else{ |
|
|
|
needpay = new Double(WxRentContractServiceImpl.getMonthNeedPay(priceD, startDate, endDate)).longValue(); |
|
|
|
} |
|
|
|
}else if(i == 0){//第一期 |
|
|
|
|