diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java index 1e15422b1..18385c9b3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java @@ -311,26 +311,24 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { @Override public ResultData updateLatePayMoney(WxBillProperty record, MallUserInfo user) { + final IdWorker idWorker = IdWorker.get(); + WxBillAction billAction = new WxBillAction(); + if(record.getLatePayMoneyUpdate() != null) { record.setLatePayPrice(Long.parseLong(record.getLatePayMoneyUpdate()) * 100); + + billAction.setId(idWorker.nextId()); + billAction.setCreatetime(new Date()); + billAction.setUserName("系统端"); + billAction.setAction(EnumBillAction.UPDATE_LATE_PAY_MONEY.getCode()); + billAction.setBillId(record.getId()); + billAction.setDetails(record.getLatePayMoneyBefore()+"元变更为" +record.getLatePayMoneyUpdate()+"元"); + billAction.setUpdatetime(new Date()); + wxBillActionMapper.insert(billAction); } if(record.getServiceChargePay() != null) { record.setServiceChargePay(record.getServiceChargePay() * 100); - } - wxBillPropertyMapper.updateById(record); - final IdWorker idWorker = IdWorker.get(); - WxBillAction billAction = new WxBillAction(); - billAction.setId(idWorker.nextId()); - billAction.setCreatetime(new Date()); - billAction.setUserName("系统端"); - billAction.setAction(EnumBillAction.UPDATE_LATE_PAY_MONEY.getCode()); - billAction.setBillId(record.getId()); - billAction.setDetails(record.getLatePayMoneyBefore()+"元变更为" +record.getLatePayMoneyUpdate()+"元"); - billAction.setUpdatetime(new Date()); - wxBillActionMapper.insert(billAction); - - if(record.getServiceChargePay() != null) { billAction = new WxBillAction(); billAction.setId(idWorker.nextId()); billAction.setCreatetime(new Date()); @@ -341,7 +339,7 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { billAction.setUpdatetime(new Date()); wxBillActionMapper.insert(billAction); } - + wxBillPropertyMapper.updateById(record); return new ResultData(); } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java index 13b8067af..bc6336a02 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -425,26 +425,24 @@ public class WxBillRentServiceImpl implements WxBillRentService { @Override public ResultData updateLatePayMoney(WxBillRent record, MallUserInfo user) { + final IdWorker idWorker = IdWorker.get(); + WxBillAction billAction = new WxBillAction(); + if(record.getLatePayMoneyUpdate() != null) { record.setLatePayPrice(Long.parseLong(record.getLatePayMoneyUpdate()) * 100); + + billAction.setId(idWorker.nextId()); + billAction.setCreatetime(new Date()); + billAction.setUserName("系统端"); + billAction.setAction(EnumBillAction.UPDATE_LATE_PAY_MONEY.getCode()); + billAction.setBillId(record.getId()); + billAction.setDetails(record.getLatePayMoneyBefore()+"元变更为" +record.getLatePayMoneyUpdate()+"元"); + billAction.setUpdatetime(new Date()); + wxBillActionMapper.insert(billAction); } if(record.getServiceChargePay() != null) { record.setServiceChargePay(record.getServiceChargePay() * 100); - } - wxBillRentMapper.updateById(record); - final IdWorker idWorker = IdWorker.get(); - WxBillAction billAction = new WxBillAction(); - billAction.setId(idWorker.nextId()); - billAction.setCreatetime(new Date()); - billAction.setUserName("系统端"); - billAction.setAction(EnumBillAction.UPDATE_LATE_PAY_MONEY.getCode()); - billAction.setBillId(record.getId()); - billAction.setDetails(record.getLatePayMoneyBefore()+"元变更为" +record.getLatePayMoneyUpdate()+"元"); - billAction.setUpdatetime(new Date()); - wxBillActionMapper.insert(billAction); - - if(record.getServiceChargePay() != null) { billAction = new WxBillAction(); billAction.setId(idWorker.nextId()); billAction.setCreatetime(new Date()); @@ -455,6 +453,8 @@ public class WxBillRentServiceImpl implements WxBillRentService { billAction.setUpdatetime(new Date()); wxBillActionMapper.insert(billAction); } + + wxBillRentMapper.updateById(record); return new ResultData(); } }