|
|
@@ -1301,34 +1301,26 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
operatingManageFeeNeedpayFront = operationManagerPriceArrs[index - 1];
|
|
|
operatingManageFeeNeedpayFront = operationManagerPriceArrs[index - 1];
|
|
|
}
|
|
|
}
|
|
|
}else {
|
|
|
}else {
|
|
|
//endDate是每年的终止日期 00:00:00
|
|
|
|
|
|
//billTimeVo.getEndDate()是23:59:59
|
|
|
|
|
|
//如果此时是同一天,则不用分割
|
|
|
|
|
|
Date yeardateEnd = DateUtils.getDayEnd(endDate);
|
|
|
|
|
|
boolean isNeddCut = true;
|
|
|
|
|
|
Date currentEnd = billTimeVo.getEndDate();
|
|
|
|
|
|
if (billTimeVo.getEndDate().equals(yeardateEnd) || billTimeVo.getEndDate().before(yeardateEnd)) {
|
|
|
|
|
|
isNeddCut = false;
|
|
|
|
|
|
}else {
|
|
|
|
|
|
currentEnd = DateUtils.getDaySet(yeardateEnd, Calendar.DATE, -1);
|
|
|
|
|
|
}
|
|
|
|
|
|
needpayFront = WxRentContractHelper.getNeedPayMoney(freePeriods,wxRentContract, priceArrs[index - 1], billTimeVo.getStartDate(), currentEnd, i, billTimeVoList.size(), saveDb, dayType, receivePeriod);
|
|
|
|
|
|
if (isNeddCut) {
|
|
|
|
|
|
needpayAfter = WxRentContractHelper.getNeedPayMoney(freePeriods,wxRentContract, priceArrs[index], DateUtils.getDaySet(currentEnd, Calendar.SECOND, 1), billTimeVo.getEndDate(), i, billTimeVoList.size(), saveDb, dayType, receivePeriod);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
needpayFront = WxRentContractHelper.getNeedPayMoney(freePeriods,wxRentContract, priceArrs[index - 1], billTimeVo.getStartDate(), DateUtils.getDaySet(endDate, Calendar.SECOND, -1), i, billTimeVoList.size(), saveDb, dayType, receivePeriod);
|
|
|
|
|
|
needpayAfter = WxRentContractHelper.getNeedPayMoney(freePeriods,wxRentContract, priceArrs[index], endDate, billTimeVo.getEndDate(), i, billTimeVoList.size(), saveDb, dayType, receivePeriod);
|
|
|
if (null != bussinessManagerPriceArrs && bussinessManagerPriceArrs.length > 0) {
|
|
|
if (null != bussinessManagerPriceArrs && bussinessManagerPriceArrs.length > 0) {
|
|
|
bussinessManageFeeNeedpayFront = WxRentContractHelper.getNeedPayMoney(freePeriods,wxRentContract, bussinessManagerPriceArrs[index - 1], billTimeVo.getStartDate(), currentEnd, i, billTimeVoList.size(), saveDb, dayType, receivePeriod);
|
|
|
|
|
|
if (isNeddCut) {
|
|
|
|
|
|
bussinessManageFeeNeedpayAfter = WxRentContractHelper.getNeedPayMoney(freePeriods,wxRentContract, bussinessManagerPriceArrs[index], DateUtils.getDaySet(currentEnd, Calendar.SECOND, 1), billTimeVo.getEndDate(), i, billTimeVoList.size(), saveDb, dayType, receivePeriod);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
bussinessManageFeeNeedpayFront = WxRentContractHelper.getNeedPayMoney(freePeriods,wxRentContract, bussinessManagerPriceArrs[index - 1], billTimeVo.getStartDate(), DateUtils.getDaySet(endDate, Calendar.SECOND, -1), i, billTimeVoList.size(), saveDb, dayType, receivePeriod);
|
|
|
|
|
|
bussinessManageFeeNeedpayAfter = WxRentContractHelper.getNeedPayMoney(freePeriods,wxRentContract, bussinessManagerPriceArrs[index], endDate, billTimeVo.getEndDate(), i, billTimeVoList.size(), saveDb, dayType, receivePeriod);
|
|
|
}
|
|
|
}
|
|
|
if (null != operationManagerPriceArrs && operationManagerPriceArrs.length > 0) {
|
|
|
if (null != operationManagerPriceArrs && operationManagerPriceArrs.length > 0) {
|
|
|
operatingManageFeeNeedpayFront = WxRentContractHelper.getNeedPayMoney(freePeriods,wxRentContract, operationManagerPriceArrs[index - 1], billTimeVo.getStartDate(), currentEnd, i, billTimeVoList.size(), saveDb, dayType, receivePeriod);
|
|
|
|
|
|
if (isNeddCut) {
|
|
|
|
|
|
operatingManageFeeNeedpayAfter = WxRentContractHelper.getNeedPayMoney(freePeriods,wxRentContract, operationManagerPriceArrs[index], DateUtils.getDaySet(currentEnd, Calendar.SECOND, 1), billTimeVo.getEndDate(), i, billTimeVoList.size(), saveDb, dayType, receivePeriod);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
operatingManageFeeNeedpayFront = WxRentContractHelper.getNeedPayMoney(freePeriods,wxRentContract, operationManagerPriceArrs[index - 1], billTimeVo.getStartDate(), DateUtils.getDaySet(endDate, Calendar.SECOND, -1), i, billTimeVoList.size(), saveDb, dayType, receivePeriod);
|
|
|
|
|
|
operatingManageFeeNeedpayAfter = WxRentContractHelper.getNeedPayMoney(freePeriods,wxRentContract, operationManagerPriceArrs[index], endDate, billTimeVo.getEndDate(), i, billTimeVoList.size(), saveDb, dayType, receivePeriod);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
|
|
|
//下一年的第一天
|
|
|
|
|
|
}else if (billTimeVo.getStartDate().equals(endDate)) {
|
|
|
|
|
|
needpayFront = WxRentContractHelper.getNeedPayMoney(freePeriods,wxRentContract, priceArrs[index], billTimeVo.getStartDate(), billTimeVo.getEndDate(), i, billTimeVoList.size(), saveDb,dayType,receivePeriod);
|
|
|
|
|
|
if (null != bussinessManagerPriceArrs && bussinessManagerPriceArrs.length > 0) {
|
|
|
|
|
|
bussinessManageFeeNeedpayFront = WxRentContractHelper.getNeedPayMoney(freePeriods,wxRentContract, bussinessManagerPriceArrs[index], billTimeVo.getStartDate(), billTimeVo.getEndDate(), i, billTimeVoList.size(), saveDb,dayType,receivePeriod);
|
|
|
|
|
|
}
|
|
|
|
|
|
if (null != operationManagerPriceArrs && operationManagerPriceArrs.length > 0) {
|
|
|
|
|
|
operatingManageFeeNeedpayFront = WxRentContractHelper.getNeedPayMoney(freePeriods,wxRentContract, operationManagerPriceArrs[index], billTimeVo.getStartDate(), billTimeVo.getEndDate(), i, billTimeVoList.size(), saveDb,dayType,receivePeriod);
|
|
|
|
|
|
}
|
|
|
}else{
|
|
|
}else{
|
|
|
//如果是按自然月,则这一年和下一年交叉部分需要重新计算
|
|
|
//如果是按自然月,则这一年和下一年交叉部分需要重新计算
|
|
|
if(wxRentContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_NAR_MONTH.getCode())) {
|
|
|
if(wxRentContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_NAR_MONTH.getCode())) {
|
|
|
|