| @@ -1038,11 +1038,12 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||||
| if (daily != null) { | if (daily != null) { | ||||
| if (!daily.getStatus().equals(EnumBillRentStatus.PAID.getCode())) { | if (!daily.getStatus().equals(EnumBillRentStatus.PAID.getCode())) { | ||||
| long allPay = new BigDecimal(daily.getPay()).add(new BigDecimal(pay)).longValueExact(); | long allPay = new BigDecimal(daily.getPay()).add(new BigDecimal(pay)).longValueExact(); | ||||
| daily.setExpiredDay(0L); | |||||
| if (allPay >= receivePay) { | if (allPay >= receivePay) { | ||||
| daily.setStatus(EnumBillRentStatus.PAID.getCode()); | daily.setStatus(EnumBillRentStatus.PAID.getCode()); | ||||
| } else { | |||||
| Date payDate = bill.getPayDate(); | Date payDate = bill.getPayDate(); | ||||
| Date receiveDate = bill.getReceiveDate(); | Date receiveDate = bill.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); | ||||
| @@ -1115,11 +1116,12 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||||
| if (other != null) { | if (other != null) { | ||||
| if (!other.getStatus().equals(EnumBillRentStatus.PAID.getCode())) { | if (!other.getStatus().equals(EnumBillRentStatus.PAID.getCode())) { | ||||
| long allPay = new BigDecimal(other.getPay()).add(new BigDecimal(pay)).longValueExact(); | long allPay = new BigDecimal(other.getPay()).add(new BigDecimal(pay)).longValueExact(); | ||||
| other.setExpiredDay(0L); | |||||
| if (allPay >= receivePay) { | if (allPay >= receivePay) { | ||||
| other.setStatus(EnumBillRentStatus.PAID.getCode()); | other.setStatus(EnumBillRentStatus.PAID.getCode()); | ||||
| } else { | |||||
| Date payDate = bill.getPayDate(); | Date payDate = bill.getPayDate(); | ||||
| Date receiveDate = bill.getReceiveDate(); | Date receiveDate = bill.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); | ||||
| @@ -1195,11 +1197,12 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||||
| if (otherDeposit != null) { | if (otherDeposit != null) { | ||||
| if (!otherDeposit.getStatus().equals(EnumBillRentStatus.PAID.getCode()) && !otherDeposit.getStatus().equals(EnumBillRentStatus.RETURN.getCode())) { | if (!otherDeposit.getStatus().equals(EnumBillRentStatus.PAID.getCode()) && !otherDeposit.getStatus().equals(EnumBillRentStatus.RETURN.getCode())) { | ||||
| long allPay = new BigDecimal(otherDeposit.getPay()).add(new BigDecimal(pay)).longValueExact(); | long allPay = new BigDecimal(otherDeposit.getPay()).add(new BigDecimal(pay)).longValueExact(); | ||||
| otherDeposit.setExpiredDay(0L); | |||||
| if (allPay >= receivePay) { | if (allPay >= receivePay) { | ||||
| otherDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); | otherDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); | ||||
| } else { | |||||
| Date payDate = bill.getPayDate(); | Date payDate = bill.getPayDate(); | ||||
| Date receiveDate = bill.getReceiveDate(); | Date receiveDate = bill.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); | ||||
| @@ -1288,11 +1291,12 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||||
| WxBillRent rent = wxBillRentMapper.selectBillOne(rentQuery); | WxBillRent rent = wxBillRentMapper.selectBillOne(rentQuery); | ||||
| if (rent != null && !rent.getStatus().equals(EnumBillRentStatus.PAID.getCode())) { | if (rent != null && !rent.getStatus().equals(EnumBillRentStatus.PAID.getCode())) { | ||||
| long pay = new BigDecimal(bill.getPayStr()).multiply(new BigDecimal(100)).longValueExact(); | long pay = new BigDecimal(bill.getPayStr()).multiply(new BigDecimal(100)).longValueExact(); | ||||
| rent.setExpiredDay(0L); | |||||
| if (rent.getOwe() <= pay) { | if (rent.getOwe() <= pay) { | ||||
| rent.setStatus(EnumBillRentStatus.PAID.getCode()); | rent.setStatus(EnumBillRentStatus.PAID.getCode()); | ||||
| } else { | |||||
| Date payDate = bill.getPayDate(); | Date payDate = bill.getPayDate(); | ||||
| Date receiveDate = bill.getReceiveDate(); | Date receiveDate = bill.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); | ||||
| @@ -1320,11 +1324,12 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||||
| WxBillProperty property = wxBillPropertyMapper.selectBillOne(propertyQuery); | WxBillProperty property = wxBillPropertyMapper.selectBillOne(propertyQuery); | ||||
| if (property != null && !property.getStatus().equals(EnumBillRentStatus.PAID.getCode())) { | if (property != null && !property.getStatus().equals(EnumBillRentStatus.PAID.getCode())) { | ||||
| long pay = new BigDecimal(bill.getPayStr()).multiply(new BigDecimal(100)).longValueExact(); | long pay = new BigDecimal(bill.getPayStr()).multiply(new BigDecimal(100)).longValueExact(); | ||||
| property.setExpiredDay(0L); | |||||
| if (property.getOwe() <= pay) { | if (property.getOwe() <= pay) { | ||||
| property.setStatus(EnumBillRentStatus.PAID.getCode()); | property.setStatus(EnumBillRentStatus.PAID.getCode()); | ||||
| } else { | |||||
| Date payDate = bill.getPayDate(); | Date payDate = bill.getPayDate(); | ||||
| Date receiveDate = bill.getReceiveDate(); | Date receiveDate = bill.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); | ||||