|
|
|
@@ -666,20 +666,20 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService |
|
|
|
for (int i = 0; i < size; i++) { |
|
|
|
Calendar instance = Calendar.getInstance(); |
|
|
|
Date startDate; |
|
|
|
//自然月 |
|
|
|
if(wxPropertyContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_NAR_MONTH.getCode())){ |
|
|
|
if(i == 0){ //第一期 |
|
|
|
startDate = rentalStartDate; |
|
|
|
}else{ |
|
|
|
instance.setTime(rentalStartDate); |
|
|
|
instance.add(Calendar.MONTH, month * i); |
|
|
|
startDate = DateUtils.getFirstDayForCurrMonth(instance.getTime()); |
|
|
|
} |
|
|
|
}else{ |
|
|
|
// //自然月 |
|
|
|
// if(wxPropertyContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_NAR_MONTH.getCode())){ |
|
|
|
// if(i == 0){ //第一期 |
|
|
|
// startDate = rentalStartDate; |
|
|
|
// }else{ |
|
|
|
// instance.setTime(rentalStartDate); |
|
|
|
// instance.add(Calendar.MONTH, month * i); |
|
|
|
// startDate = DateUtils.getFirstDayForCurrMonth(instance.getTime()); |
|
|
|
// } |
|
|
|
// }else{ |
|
|
|
instance.setTime(rentalStartDate); |
|
|
|
instance.add(Calendar.MONTH, month * i); |
|
|
|
startDate = instance.getTime(); |
|
|
|
} |
|
|
|
// } |
|
|
|
yearList.add(startDate); |
|
|
|
} |
|
|
|
Map<String, Object> resultMap = buildRent(receivePeriod, priceArr, yearList, wxPropertyContract.getReceivePeriodUnit(), wxPropertyContract, user, wxMerchant, billcount, isPreview, shopInfo,saveDb); |
|
|
|
|