| @@ -210,7 +210,7 @@ public class WxFlowServiceImpl implements WxFlowService { | |||||
| wxBillRent.setUpdatetime(updateDate); | wxBillRent.setUpdatetime(updateDate); | ||||
| wxBillRentMapper.updateByPrimaryKeySelective(wxBillRent); | wxBillRentMapper.updateByPrimaryKeySelective(wxBillRent); | ||||
| //账单日志 | //账单日志 | ||||
| addBillAction(oldPrice, newPrice, mallUserInfo); | |||||
| addBillAction(businessId, oldPrice, newPrice, mallUserInfo); | |||||
| } else if (billType.equals(EnumBillTypeParam.RENT_DEPOSIT.getCode())) { | } else if (billType.equals(EnumBillTypeParam.RENT_DEPOSIT.getCode())) { | ||||
| //租赁押金账单更新 | //租赁押金账单更新 | ||||
| WxBillDeposit wxBillDeposit = new WxBillDeposit(); | WxBillDeposit wxBillDeposit = new WxBillDeposit(); | ||||
| @@ -219,7 +219,7 @@ public class WxFlowServiceImpl implements WxFlowService { | |||||
| wxBillDeposit.setUpdatetime(updateDate); | wxBillDeposit.setUpdatetime(updateDate); | ||||
| wxBillDepositMapper.updateByPrimaryKeySelective(wxBillDeposit); | wxBillDepositMapper.updateByPrimaryKeySelective(wxBillDeposit); | ||||
| //账单日志 | //账单日志 | ||||
| addBillAction(oldPrice, newPrice, mallUserInfo); | |||||
| addBillAction(businessId, oldPrice, newPrice, mallUserInfo); | |||||
| } else if (billType.equals(EnumBillTypeParam.PROPERTY.getCode())) { | } else if (billType.equals(EnumBillTypeParam.PROPERTY.getCode())) { | ||||
| //物业账单更新 | //物业账单更新 | ||||
| WxBillProperty wxBillProperty = new WxBillProperty(); | WxBillProperty wxBillProperty = new WxBillProperty(); | ||||
| @@ -228,7 +228,7 @@ public class WxFlowServiceImpl implements WxFlowService { | |||||
| wxBillProperty.setUpdatetime(updateDate); | wxBillProperty.setUpdatetime(updateDate); | ||||
| wxBillPropertyMapper.updateByPrimaryKeySelective(wxBillProperty); | wxBillPropertyMapper.updateByPrimaryKeySelective(wxBillProperty); | ||||
| //账单日志 | //账单日志 | ||||
| addBillAction(oldPrice, newPrice, mallUserInfo); | |||||
| addBillAction(businessId, oldPrice, newPrice, mallUserInfo); | |||||
| } else if (billType.equals(EnumBillTypeParam.PROPERTY_DEPOSIT.getCode())) { | } else if (billType.equals(EnumBillTypeParam.PROPERTY_DEPOSIT.getCode())) { | ||||
| //物业押金账单更新 | //物业押金账单更新 | ||||
| WxBillPropertyDeposit wxBillPropertyDeposit = new WxBillPropertyDeposit(); | WxBillPropertyDeposit wxBillPropertyDeposit = new WxBillPropertyDeposit(); | ||||
| @@ -237,17 +237,17 @@ public class WxFlowServiceImpl implements WxFlowService { | |||||
| wxBillPropertyDeposit.setUpdatetime(updateDate); | wxBillPropertyDeposit.setUpdatetime(updateDate); | ||||
| wxBillPropertyDepositMapper.updateByPrimaryKeySelective(wxBillPropertyDeposit); | wxBillPropertyDepositMapper.updateByPrimaryKeySelective(wxBillPropertyDeposit); | ||||
| //账单日志 | //账单日志 | ||||
| addBillAction(oldPrice, newPrice, mallUserInfo); | |||||
| addBillAction(businessId, oldPrice, newPrice, mallUserInfo); | |||||
| } else if (billType.equals(EnumBillTypeParam.WATER.getCode())) { | } else if (billType.equals(EnumBillTypeParam.WATER.getCode())) { | ||||
| //水费账单更新 | //水费账单更新 | ||||
| updateDailyBill(businessId, newPrice, updateDate); | updateDailyBill(businessId, newPrice, updateDate); | ||||
| //账单日志 | //账单日志 | ||||
| addBillAction(oldPrice, newPrice, mallUserInfo); | |||||
| addBillAction(businessId, oldPrice, newPrice, mallUserInfo); | |||||
| } else if (billType.equals(EnumBillTypeParam.POWER.getCode())) { | } else if (billType.equals(EnumBillTypeParam.POWER.getCode())) { | ||||
| //电费账单更新 | //电费账单更新 | ||||
| updateDailyBill(businessId, newPrice, updateDate); | updateDailyBill(businessId, newPrice, updateDate); | ||||
| //账单日志 | //账单日志 | ||||
| addBillAction(oldPrice, newPrice, mallUserInfo); | |||||
| addBillAction(businessId, oldPrice, newPrice, mallUserInfo); | |||||
| } else if (billType.equals(EnumBillTypeParam.ROUTINE.getCode())) { | } else if (billType.equals(EnumBillTypeParam.ROUTINE.getCode())) { | ||||
| //其他费用账单更新 | //其他费用账单更新 | ||||
| WxBillOther wxBillOther = new WxBillOther(); | WxBillOther wxBillOther = new WxBillOther(); | ||||
| @@ -256,7 +256,7 @@ public class WxFlowServiceImpl implements WxFlowService { | |||||
| wxBillOther.setUpdatetime(updateDate); | wxBillOther.setUpdatetime(updateDate); | ||||
| wxBillOtherMapper.updateByPrimaryKeySelective(wxBillOther); | wxBillOtherMapper.updateByPrimaryKeySelective(wxBillOther); | ||||
| //账单日志 | //账单日志 | ||||
| addBillAction(oldPrice, newPrice, mallUserInfo); | |||||
| addBillAction(businessId, oldPrice, newPrice, mallUserInfo); | |||||
| } else if (billType.equals(EnumBillTypeParam.ATHER_DEPOSIT.getCode())) { | } else if (billType.equals(EnumBillTypeParam.ATHER_DEPOSIT.getCode())) { | ||||
| //其他押金账单更新 | //其他押金账单更新 | ||||
| WxBillOtherDeposit wxBillOtherDeposit = new WxBillOtherDeposit(); | WxBillOtherDeposit wxBillOtherDeposit = new WxBillOtherDeposit(); | ||||
| @@ -265,7 +265,7 @@ public class WxFlowServiceImpl implements WxFlowService { | |||||
| wxBillOtherDeposit.setUpdatetime(updateDate); | wxBillOtherDeposit.setUpdatetime(updateDate); | ||||
| wxBillOtherDepositMapper.updateByPrimaryKeySelective(wxBillOtherDeposit); | wxBillOtherDepositMapper.updateByPrimaryKeySelective(wxBillOtherDeposit); | ||||
| //账单日志 | //账单日志 | ||||
| addBillAction(oldPrice, newPrice, mallUserInfo); | |||||
| addBillAction(businessId, oldPrice, newPrice, mallUserInfo); | |||||
| } else { | } else { | ||||
| logger.info("未找到账单类型"); | logger.info("未找到账单类型"); | ||||
| } | } | ||||
| @@ -281,8 +281,9 @@ public class WxFlowServiceImpl implements WxFlowService { | |||||
| wxBillDailyMapper.updateByPrimaryKeySelective(wxBillDaily); | wxBillDailyMapper.updateByPrimaryKeySelective(wxBillDaily); | ||||
| } | } | ||||
| public void addBillAction(Integer oldPrice, Integer newPrice, MallUserInfo mallUserInfo) { | |||||
| public void addBillAction(Long billId, Integer oldPrice, Integer newPrice, MallUserInfo mallUserInfo) { | |||||
| WxBillAction wxBillAction = new WxBillAction(); | WxBillAction wxBillAction = new WxBillAction(); | ||||
| wxBillAction.setBillId(billId); | |||||
| wxBillAction.setOldPrice(oldPrice); | wxBillAction.setOldPrice(oldPrice); | ||||
| wxBillAction.setNewPrice(newPrice); | wxBillAction.setNewPrice(newPrice); | ||||
| wxBillActionService.modifyBill(wxBillAction, mallUserInfo); | wxBillActionService.modifyBill(wxBillAction, mallUserInfo); | ||||