| @@ -981,6 +981,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||||
| rent.setStatus(EnumBillRentStatus.PAID.getCode()); | rent.setStatus(EnumBillRentStatus.PAID.getCode()); | ||||
| Date payDate = rent.getPayDate(); | Date payDate = rent.getPayDate(); | ||||
| Date receiveDate = rent.getReceiveDate(); | Date receiveDate = rent.getReceiveDate(); | ||||
| rent.setExpiredDay(0L); | |||||
| if (payDate.after(receiveDate)) { | if (payDate.after(receiveDate)) { | ||||
| int expiredDay = DateUtils.daysBetween(receiveDate, payDate); | int expiredDay = DateUtils.daysBetween(receiveDate, payDate); | ||||
| rent.setExpiredDay((long) expiredDay); | rent.setExpiredDay((long) expiredDay); | ||||
| @@ -1012,6 +1013,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||||
| property.setStatus(EnumBillRentStatus.PAID.getCode()); | property.setStatus(EnumBillRentStatus.PAID.getCode()); | ||||
| Date payDate = property.getPayDate(); | Date payDate = property.getPayDate(); | ||||
| Date receiveDate = property.getReceiveDate(); | Date receiveDate = property.getReceiveDate(); | ||||
| property.setExpiredDay(0L); | |||||
| if (payDate.after(receiveDate)) { | if (payDate.after(receiveDate)) { | ||||
| int expiredDay = DateUtils.daysBetween(receiveDate, payDate); | int expiredDay = DateUtils.daysBetween(receiveDate, payDate); | ||||
| property.setExpiredDay((long) expiredDay); | property.setExpiredDay((long) expiredDay); | ||||
| @@ -1048,6 +1050,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||||
| daily.setStatus(EnumBillRentStatus.PAID.getCode()); | daily.setStatus(EnumBillRentStatus.PAID.getCode()); | ||||
| Date payDate = daily.getPayDate(); | Date payDate = daily.getPayDate(); | ||||
| Date receiveDate = daily.getReceiveDate(); | Date receiveDate = daily.getReceiveDate(); | ||||
| daily.setExpiredDay(0L); | |||||
| if (payDate.after(receiveDate)) { | if (payDate.after(receiveDate)) { | ||||
| int expiredDay = DateUtils.daysBetween(receiveDate, payDate); | int expiredDay = DateUtils.daysBetween(receiveDate, payDate); | ||||
| daily.setExpiredDay((long) expiredDay); | daily.setExpiredDay((long) expiredDay); | ||||
| @@ -1113,6 +1116,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||||
| other.setStatus(EnumBillRentStatus.PAID.getCode()); | other.setStatus(EnumBillRentStatus.PAID.getCode()); | ||||
| Date payDate = other.getPayDate(); | Date payDate = other.getPayDate(); | ||||
| Date receiveDate = other.getReceiveDate(); | Date receiveDate = other.getReceiveDate(); | ||||
| other.setExpiredDay(0L); | |||||
| if (payDate.after(receiveDate)) { | if (payDate.after(receiveDate)) { | ||||
| int expiredDay = DateUtils.daysBetween(receiveDate, payDate); | int expiredDay = DateUtils.daysBetween(receiveDate, payDate); | ||||
| other.setExpiredDay((long) expiredDay); | other.setExpiredDay((long) expiredDay); | ||||
| @@ -1181,6 +1185,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||||
| otherDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); | otherDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); | ||||
| Date payDate = otherDeposit.getPayDate(); | Date payDate = otherDeposit.getPayDate(); | ||||
| Date receiveDate = otherDeposit.getReceiveDate(); | Date receiveDate = otherDeposit.getReceiveDate(); | ||||
| otherDeposit.setExpiredDay(0L); | |||||
| if (payDate.after(receiveDate)) { | if (payDate.after(receiveDate)) { | ||||
| int expiredDay = DateUtils.daysBetween(receiveDate, payDate); | int expiredDay = DateUtils.daysBetween(receiveDate, payDate); | ||||
| otherDeposit.setExpiredDay((long) expiredDay); | otherDeposit.setExpiredDay((long) expiredDay); | ||||