From 3a00527d46151caba590ffe7a6bf3bf094524765 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Fri, 19 Apr 2019 17:40:05 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=B4=A6=E5=8D=95=E5=AE=A1=E6=89=B9][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E4=BF=9D=E5=AD=98=E8=B4=A6=E5=8D=95?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E8=AE=B0=E5=BD=95]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxFlowServiceImpl.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index 0c873aeee..7ee439f99 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -210,7 +210,7 @@ public class WxFlowServiceImpl implements WxFlowService { wxBillRent.setUpdatetime(updateDate); wxBillRentMapper.updateByPrimaryKeySelective(wxBillRent); //账单日志 - addBillAction(oldPrice, newPrice, mallUserInfo); + addBillAction(businessId, oldPrice, newPrice, mallUserInfo); } else if (billType.equals(EnumBillTypeParam.RENT_DEPOSIT.getCode())) { //租赁押金账单更新 WxBillDeposit wxBillDeposit = new WxBillDeposit(); @@ -219,7 +219,7 @@ public class WxFlowServiceImpl implements WxFlowService { wxBillDeposit.setUpdatetime(updateDate); wxBillDepositMapper.updateByPrimaryKeySelective(wxBillDeposit); //账单日志 - addBillAction(oldPrice, newPrice, mallUserInfo); + addBillAction(businessId, oldPrice, newPrice, mallUserInfo); } else if (billType.equals(EnumBillTypeParam.PROPERTY.getCode())) { //物业账单更新 WxBillProperty wxBillProperty = new WxBillProperty(); @@ -228,7 +228,7 @@ public class WxFlowServiceImpl implements WxFlowService { wxBillProperty.setUpdatetime(updateDate); wxBillPropertyMapper.updateByPrimaryKeySelective(wxBillProperty); //账单日志 - addBillAction(oldPrice, newPrice, mallUserInfo); + addBillAction(businessId, oldPrice, newPrice, mallUserInfo); } else if (billType.equals(EnumBillTypeParam.PROPERTY_DEPOSIT.getCode())) { //物业押金账单更新 WxBillPropertyDeposit wxBillPropertyDeposit = new WxBillPropertyDeposit(); @@ -237,17 +237,17 @@ public class WxFlowServiceImpl implements WxFlowService { wxBillPropertyDeposit.setUpdatetime(updateDate); wxBillPropertyDepositMapper.updateByPrimaryKeySelective(wxBillPropertyDeposit); //账单日志 - addBillAction(oldPrice, newPrice, mallUserInfo); + addBillAction(businessId, oldPrice, newPrice, mallUserInfo); } else if (billType.equals(EnumBillTypeParam.WATER.getCode())) { //水费账单更新 updateDailyBill(businessId, newPrice, updateDate); //账单日志 - addBillAction(oldPrice, newPrice, mallUserInfo); + addBillAction(businessId, oldPrice, newPrice, mallUserInfo); } else if (billType.equals(EnumBillTypeParam.POWER.getCode())) { //电费账单更新 updateDailyBill(businessId, newPrice, updateDate); //账单日志 - addBillAction(oldPrice, newPrice, mallUserInfo); + addBillAction(businessId, oldPrice, newPrice, mallUserInfo); } else if (billType.equals(EnumBillTypeParam.ROUTINE.getCode())) { //其他费用账单更新 WxBillOther wxBillOther = new WxBillOther(); @@ -256,7 +256,7 @@ public class WxFlowServiceImpl implements WxFlowService { wxBillOther.setUpdatetime(updateDate); wxBillOtherMapper.updateByPrimaryKeySelective(wxBillOther); //账单日志 - addBillAction(oldPrice, newPrice, mallUserInfo); + addBillAction(businessId, oldPrice, newPrice, mallUserInfo); } else if (billType.equals(EnumBillTypeParam.ATHER_DEPOSIT.getCode())) { //其他押金账单更新 WxBillOtherDeposit wxBillOtherDeposit = new WxBillOtherDeposit(); @@ -265,7 +265,7 @@ public class WxFlowServiceImpl implements WxFlowService { wxBillOtherDeposit.setUpdatetime(updateDate); wxBillOtherDepositMapper.updateByPrimaryKeySelective(wxBillOtherDeposit); //账单日志 - addBillAction(oldPrice, newPrice, mallUserInfo); + addBillAction(businessId, oldPrice, newPrice, mallUserInfo); } else { logger.info("未找到账单类型"); } @@ -281,8 +281,9 @@ public class WxFlowServiceImpl implements WxFlowService { 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.setBillId(billId); wxBillAction.setOldPrice(oldPrice); wxBillAction.setNewPrice(newPrice); wxBillActionService.modifyBill(wxBillAction, mallUserInfo);