|
|
@@ -563,7 +563,11 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
if(i == 0){//第一期 |
|
|
if(i == 0){//第一期 |
|
|
needpay = new Double(WxRentContractServiceImpl.getMonthNeedPay(priceD,billTimeVo.getStartDate(),billTimeVo.getEndDate())).longValue(); |
|
|
|
|
|
|
|
|
if(wxPropertyContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_NAR_MONTH.getCode())){ |
|
|
|
|
|
needpay = new Double(WxRentContractServiceImpl.getMonthNeedPay(priceD,billTimeVo.getStartDate(),billTimeVo.getEndDate())).longValue(); |
|
|
|
|
|
}else{ |
|
|
|
|
|
needpay = new Double(receivePeriod * priceD).longValue(); |
|
|
|
|
|
} |
|
|
}else if(i == billTimeVoList.size()-1){//最后 |
|
|
}else if(i == billTimeVoList.size()-1){//最后 |
|
|
needpay = new Double(WxRentContractServiceImpl.getMonthNeedPay(priceD,billTimeVo.getStartDate(),billTimeVo.getEndDate())).longValue(); |
|
|
needpay = new Double(WxRentContractServiceImpl.getMonthNeedPay(priceD,billTimeVo.getStartDate(),billTimeVo.getEndDate())).longValue(); |
|
|
}else{//中间 |
|
|
}else{//中间 |
|
|
@@ -648,7 +652,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService |
|
|
//按月计租 |
|
|
//按月计租 |
|
|
// if (propertyContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_MONTH.getCode()) |
|
|
// if (propertyContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_MONTH.getCode()) |
|
|
// ||propertyContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_NAR_MONTH.getCode())) { |
|
|
// ||propertyContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_NAR_MONTH.getCode())) { |
|
|
result = buildRentMonth(wxMerchant, userId, propertyContract, receivePeriod, lease, rentalStartDate, price,isPreview); |
|
|
|
|
|
|
|
|
result = buildRentMonth(wxMerchant, userId, propertyContract, receivePeriod, lease, rentalStartDate, price,isPreview); |
|
|
// } else { |
|
|
// } else { |
|
|
// //如果按日 |
|
|
// //如果按日 |
|
|
// List<Date> yearList = new ArrayList<>(); |
|
|
// List<Date> yearList = new ArrayList<>(); |
|
|
@@ -914,4 +918,3 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|