|
|
@@ -1310,7 +1310,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
if (billTimeVo.getEndDate().equals(yeardateEnd) || billTimeVo.getEndDate().before(yeardateEnd)) {
|
|
|
if (billTimeVo.getEndDate().equals(yeardateEnd) || billTimeVo.getEndDate().before(yeardateEnd)) {
|
|
|
isNeddCut = false;
|
|
|
isNeddCut = false;
|
|
|
}else {
|
|
|
}else {
|
|
|
currentEnd = yeardateEnd;
|
|
|
|
|
|
|
|
|
currentEnd = DateUtils.getDaySet(yeardateEnd, Calendar.DATE, -1);
|
|
|
}
|
|
|
}
|
|
|
needpayFront = WxRentContractHelper.getNeedPayMoney(freePeriods,wxRentContract, priceArrs[index - 1], billTimeVo.getStartDate(), currentEnd, i, billTimeVoList.size(), saveDb, dayType, receivePeriod);
|
|
|
needpayFront = WxRentContractHelper.getNeedPayMoney(freePeriods,wxRentContract, priceArrs[index - 1], billTimeVo.getStartDate(), currentEnd, i, billTimeVoList.size(), saveDb, dayType, receivePeriod);
|
|
|
if (isNeddCut) {
|
|
|
if (isNeddCut) {
|
|
|
@@ -1927,13 +1927,12 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
//如果开始时间到了年的截止
|
|
|
//如果开始时间到了年的截止
|
|
|
if (timeVo.getStartDate().equals(yearEndDateStart)) {
|
|
|
if (timeVo.getStartDate().equals(yearEndDateStart)) {
|
|
|
yearsEndList.remove(yearEndDateStart);
|
|
|
yearsEndList.remove(yearEndDateStart);
|
|
|
//TODO 是不是有1天?
|
|
|
|
|
|
}else if (timeVo.getStartDate().after(yearEndDateStart)) {
|
|
|
}else if (timeVo.getStartDate().after(yearEndDateStart)) {
|
|
|
//do nothing
|
|
|
//do nothing
|
|
|
}else if (timeVo.getStartDate().before(yearEndDateStart)) {
|
|
|
}else if (timeVo.getStartDate().before(yearEndDateStart)) {
|
|
|
Date yearEndDateEnd = DateUtils.getDayEnd(yearEndDateStart);
|
|
|
Date yearEndDateEnd = DateUtils.getDayEnd(yearEndDateStart);
|
|
|
if (timeVo.getEndDate().after(yearEndDateEnd)) {
|
|
|
if (timeVo.getEndDate().after(yearEndDateEnd)) {
|
|
|
timeVo.setEndDate(yearEndDateEnd);
|
|
|
|
|
|
|
|
|
timeVo.setEndDate(DateUtils.getDaySet(yearEndDateEnd,Calendar.DATE,-1));
|
|
|
yearsEndList.remove(yearEndDateStart);
|
|
|
yearsEndList.remove(yearEndDateStart);
|
|
|
isYearCut = true;
|
|
|
isYearCut = true;
|
|
|
}else if(timeVo.getEndDate().equals(yearEndDateEnd)) {
|
|
|
}else if(timeVo.getEndDate().equals(yearEndDateEnd)) {
|
|
|
|