| @@ -167,8 +167,9 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { | |||||
| wxBillDaily.setOwe(record.getReceivePay()-record.getPay()); | wxBillDaily.setOwe(record.getReceivePay()-record.getPay()); | ||||
| if (record.getPay().equals(record.getReceivePay())) { | if (record.getPay().equals(record.getReceivePay())) { | ||||
| wxBillDaily.setStatus(EnumBillRentStatus.PAID.getCode()); | wxBillDaily.setStatus(EnumBillRentStatus.PAID.getCode()); | ||||
| Date payDate = wxBillDaily.getPayDate(); | |||||
| Date payDate = record.getPayDate(); | |||||
| Date receiveDate = wxBillDaily.getReceiveDate(); | Date receiveDate = wxBillDaily.getReceiveDate(); | ||||
| wxBillDaily.setExpiredDay(0L); | |||||
| if (payDate.after(receiveDate)) { | if (payDate.after(receiveDate)) { | ||||
| int expiredDay = DateUtils.daysBetween(receiveDate, payDate); | int expiredDay = DateUtils.daysBetween(receiveDate, payDate); | ||||
| wxBillDaily.setExpiredDay((long) expiredDay); | wxBillDaily.setExpiredDay((long) expiredDay); | ||||
| @@ -134,8 +134,9 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { | |||||
| wxBillDeposit.setOwe(record.getReceivePay()-record.getPay()); | wxBillDeposit.setOwe(record.getReceivePay()-record.getPay()); | ||||
| if (record.getPay().equals(record.getReceivePay())) { | if (record.getPay().equals(record.getReceivePay())) { | ||||
| wxBillDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); | wxBillDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); | ||||
| Date payDate = wxBillDeposit.getPayDate(); | |||||
| Date payDate = record.getPayDate(); | |||||
| Date receiveDate = wxBillDeposit.getReceiveDate(); | Date receiveDate = wxBillDeposit.getReceiveDate(); | ||||
| wxBillDeposit.setExpiredDay(0L); | |||||
| if (payDate.after(receiveDate)) { | if (payDate.after(receiveDate)) { | ||||
| int expiredDay = DateUtils.daysBetween(receiveDate, payDate); | int expiredDay = DateUtils.daysBetween(receiveDate, payDate); | ||||
| wxBillDeposit.setExpiredDay((long) expiredDay); | wxBillDeposit.setExpiredDay((long) expiredDay); | ||||
| @@ -162,8 +162,9 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService | |||||
| wxBillOtherDeposit.setOwe(record.getReceivePay() - record.getPay()); | wxBillOtherDeposit.setOwe(record.getReceivePay() - record.getPay()); | ||||
| if (record.getPay().equals(record.getReceivePay())) { | if (record.getPay().equals(record.getReceivePay())) { | ||||
| wxBillOtherDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); | wxBillOtherDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); | ||||
| Date payDate = wxBillOtherDeposit.getPayDate(); | |||||
| Date payDate = record.getPayDate(); | |||||
| Date receiveDate = wxBillOtherDeposit.getReceiveDate(); | Date receiveDate = wxBillOtherDeposit.getReceiveDate(); | ||||
| wxBillOtherDeposit.setExpiredDay(0L); | |||||
| if (payDate.after(receiveDate)) { | if (payDate.after(receiveDate)) { | ||||
| int expiredDay = DateUtils.daysBetween(receiveDate, payDate); | int expiredDay = DateUtils.daysBetween(receiveDate, payDate); | ||||
| wxBillOtherDeposit.setExpiredDay((long) expiredDay); | wxBillOtherDeposit.setExpiredDay((long) expiredDay); | ||||
| @@ -162,8 +162,9 @@ public class WxBillOtherServiceImpl implements WxBillOtherService { | |||||
| wxBillOther.setOwe(record.getReceivePay()-record.getPay()); | wxBillOther.setOwe(record.getReceivePay()-record.getPay()); | ||||
| if (record.getPay().equals(record.getReceivePay())) { | if (record.getPay().equals(record.getReceivePay())) { | ||||
| wxBillOther.setStatus(EnumBillRentStatus.PAID.getCode()); | wxBillOther.setStatus(EnumBillRentStatus.PAID.getCode()); | ||||
| Date payDate = wxBillOther.getPayDate(); | |||||
| Date payDate = record.getPayDate(); | |||||
| Date receiveDate = wxBillOther.getReceiveDate(); | Date receiveDate = wxBillOther.getReceiveDate(); | ||||
| wxBillOther.setExpiredDay(0L); | |||||
| if (payDate.after(receiveDate)) { | if (payDate.after(receiveDate)) { | ||||
| int expiredDay = DateUtils.daysBetween(receiveDate, payDate); | int expiredDay = DateUtils.daysBetween(receiveDate, payDate); | ||||
| wxBillOther.setExpiredDay((long) expiredDay); | wxBillOther.setExpiredDay((long) expiredDay); | ||||
| @@ -134,8 +134,9 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe | |||||
| wxBillDeposit.setOwe(record.getReceivePay()-record.getPay()); | wxBillDeposit.setOwe(record.getReceivePay()-record.getPay()); | ||||
| if (record.getPay().equals(record.getReceivePay())) { | if (record.getPay().equals(record.getReceivePay())) { | ||||
| wxBillDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); | wxBillDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); | ||||
| Date payDate = wxBillDeposit.getPayDate(); | |||||
| Date payDate = record.getPayDate(); | |||||
| Date receiveDate = wxBillDeposit.getReceiveDate(); | Date receiveDate = wxBillDeposit.getReceiveDate(); | ||||
| wxBillDeposit.setExpiredDay(0L); | |||||
| if (payDate.after(receiveDate)) { | if (payDate.after(receiveDate)) { | ||||
| int expiredDay = DateUtils.daysBetween(receiveDate, payDate); | int expiredDay = DateUtils.daysBetween(receiveDate, payDate); | ||||
| wxBillDeposit.setExpiredDay((long) expiredDay); | wxBillDeposit.setExpiredDay((long) expiredDay); | ||||
| @@ -143,8 +143,9 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { | |||||
| property.setOwe(record.getReceivePay()-record.getPay()); | property.setOwe(record.getReceivePay()-record.getPay()); | ||||
| if (record.getPay().equals(record.getReceivePay())) { | if (record.getPay().equals(record.getReceivePay())) { | ||||
| property.setStatus(EnumBillRentStatus.PAID.getCode()); | property.setStatus(EnumBillRentStatus.PAID.getCode()); | ||||
| Date payDate = property.getPayDate(); | |||||
| Date payDate = record.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); | ||||
| @@ -145,8 +145,9 @@ public class WxBillRentServiceImpl implements WxBillRentService { | |||||
| wxBillRent.setOwe(record.getReceivePay()-record.getPay()); | wxBillRent.setOwe(record.getReceivePay()-record.getPay()); | ||||
| if (record.getPay().equals(record.getReceivePay())) { | if (record.getPay().equals(record.getReceivePay())) { | ||||
| wxBillRent.setStatus(EnumBillRentStatus.PAID.getCode()); | wxBillRent.setStatus(EnumBillRentStatus.PAID.getCode()); | ||||
| Date payDate = wxBillRent.getPayDate(); | |||||
| Date payDate = record.getPayDate(); | |||||
| Date receiveDate = wxBillRent.getReceiveDate(); | Date receiveDate = wxBillRent.getReceiveDate(); | ||||
| wxBillRent.setExpiredDay(0L); | |||||
| if (payDate.after(receiveDate)) { | if (payDate.after(receiveDate)) { | ||||
| int expiredDay = DateUtils.daysBetween(receiveDate, payDate); | int expiredDay = DateUtils.daysBetween(receiveDate, payDate); | ||||
| wxBillRent.setExpiredDay((long) expiredDay); | wxBillRent.setExpiredDay((long) expiredDay); | ||||