| @@ -1233,26 +1233,26 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||||
| if (expiredDay > timePeriod) { | if (expiredDay > timePeriod) { | ||||
| rent.setExpiredDay((long) expiredDay); | rent.setExpiredDay((long) expiredDay); | ||||
| } | } | ||||
| } else { | |||||
| Date now = new Date(); | |||||
| int day = DateUtils.daysBetween(startDate, now); | |||||
| int timePeriod = 0; | |||||
| if (day < timePeriod) { | |||||
| rent.setStatus(EnumBillRentStatus.NOT_PAID.getCode()); | |||||
| long expiredDay = Long.valueOf(Math.abs(day)); | |||||
| rent.setExpiredDay(expiredDay); | |||||
| return rent; | |||||
| } | |||||
| Date now = new Date(); | |||||
| int day = DateUtils.daysBetween(startDate, now); | |||||
| int timePeriod = 0; | |||||
| if (day > timePeriod) { | |||||
| rent.setStatus(EnumBillRentStatus.NOT_PAID.getCode()); | |||||
| rent.setExpiredDay((long) day); | |||||
| return rent; | |||||
| } | |||||
| if (flag) { | |||||
| timePeriod = 30; | |||||
| long expiredDay = Long.valueOf(Math.abs(day)); | |||||
| if (expiredDay > timePeriod) { | |||||
| rent.setStatus(EnumBillRentStatus.NOT_EXPIRED.getCode()); | |||||
| } else { | } else { | ||||
| if (flag) { | |||||
| timePeriod = 30; | |||||
| if (day > timePeriod) { | |||||
| rent.setStatus(EnumBillRentStatus.NOT_EXPIRED.getCode()); | |||||
| } else { | |||||
| rent.setStatus(EnumBillRentStatus.WAIT_PAY.getCode()); | |||||
| } | |||||
| } else { | |||||
| rent.setStatus(EnumBillRentStatus.WAIT_PAY.getCode()); | |||||
| } | |||||
| rent.setStatus(EnumBillRentStatus.WAIT_PAY.getCode()); | |||||
| } | } | ||||
| } else { | |||||
| rent.setStatus(EnumBillRentStatus.WAIT_PAY.getCode()); | |||||
| } | } | ||||
| return rent; | return rent; | ||||
| } | } | ||||