| @@ -967,14 +967,14 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||||
| wxBillRent.setUpdatetime(updateDate); | wxBillRent.setUpdatetime(updateDate); | ||||
| if (oldLatePrice != null) { | if (oldLatePrice != null) { | ||||
| wxBillRent.setLatePayPrice(newLatePrice); | wxBillRent.setLatePayPrice(newLatePrice); | ||||
| wxBillRent.setOwe(newPrice + wxBillRent.getServiceChargePay() + newLatePrice - wxBillRent.getPay()); | |||||
| wxBillRent.setOwe(newPrice + dbBill.getServiceChargePay() + newLatePrice - dbBill.getPay()); | |||||
| wxBillRentMapper.updateById(wxBillRent); | wxBillRentMapper.updateById(wxBillRent); | ||||
| addBillAction(EnumBillAction.UPDATE_LATE_PAY_MONEY, id, oldLatePrice, newLatePrice, user); | addBillAction(EnumBillAction.UPDATE_LATE_PAY_MONEY, id, oldLatePrice, newLatePrice, user); | ||||
| } else { | } else { | ||||
| //租赁账单更新 | //租赁账单更新 | ||||
| wxBillRent.setReceivePay(newPrice); | wxBillRent.setReceivePay(newPrice); | ||||
| long latePayPrice = wxBillRent.getLatePayPrice() == null ? 0 : wxBillRent.getLatePayPrice(); | |||||
| wxBillRent.setOwe(newPrice + wxBillRent.getServiceChargePay() + latePayPrice - dbBill.getPay()); | |||||
| long latePayPrice = dbBill.getLatePayPrice() == null ? 0 : dbBill.getLatePayPrice(); | |||||
| wxBillRent.setOwe(newPrice + dbBill.getServiceChargePay() + latePayPrice - dbBill.getPay()); | |||||
| if (newPrice.equals(dbBill.getPay())) { | if (newPrice.equals(dbBill.getPay())) { | ||||
| wxBillRent.setStatus(EnumBillRentStatus.PAID.getCode()); | wxBillRent.setStatus(EnumBillRentStatus.PAID.getCode()); | ||||
| } | } | ||||
| @@ -1022,13 +1022,13 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||||
| wxBillProperty.setUpdatetime(updateDate); | wxBillProperty.setUpdatetime(updateDate); | ||||
| if (oldLatePrice != null) { | if (oldLatePrice != null) { | ||||
| wxBillProperty.setLatePayPrice(newLatePrice); | wxBillProperty.setLatePayPrice(newLatePrice); | ||||
| wxBillProperty.setOwe(newPrice + wxBillProperty.getServiceChargePay() + newLatePrice - wxBillProperty.getPay()); | |||||
| wxBillProperty.setOwe(newPrice + dbBill.getServiceChargePay() + newLatePrice - dbBill.getPay()); | |||||
| wxBillPropertyMapper.updateById(wxBillProperty); | wxBillPropertyMapper.updateById(wxBillProperty); | ||||
| addBillAction(EnumBillAction.UPDATE_LATE_PAY_MONEY, id, oldLatePrice, newLatePrice, user); | addBillAction(EnumBillAction.UPDATE_LATE_PAY_MONEY, id, oldLatePrice, newLatePrice, user); | ||||
| } else { | } else { | ||||
| wxBillProperty.setReceivePay(newPrice); | wxBillProperty.setReceivePay(newPrice); | ||||
| long latePayPrice = wxBillProperty.getLatePayPrice() == null ? 0 : wxBillProperty.getLatePayPrice(); | |||||
| wxBillProperty.setOwe(newPrice + wxBillProperty.getServiceChargePay() + latePayPrice - dbBill.getPay()); | |||||
| long latePayPrice = dbBill.getLatePayPrice() == null ? 0 : dbBill.getLatePayPrice(); | |||||
| wxBillProperty.setOwe(newPrice + dbBill.getServiceChargePay() + latePayPrice - dbBill.getPay()); | |||||
| if (newPrice.equals(dbBill.getPay())) { | if (newPrice.equals(dbBill.getPay())) { | ||||
| wxBillProperty.setStatus(EnumBillRentStatus.PAID.getCode()); | wxBillProperty.setStatus(EnumBillRentStatus.PAID.getCode()); | ||||
| } | } | ||||