From f3a279d365e7ff302011dea896abc6c379e8a68b Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 18 Apr 2019 14:46:24 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=8A=BC=E9=87=91][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E9=80=80=E8=BF=98=E6=B7=BB=E5=8A=A0=E8=A1=8C=E4=B8=BA=E6=97=A5?= =?UTF-8?q?=E5=BF=97]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxBillDepositController.java | 2 +- .../WxBillPropertyDepositController.java | 2 +- .../service/WxBillDepositService.java | 2 +- .../service/WxBillPropertyDepositService.java | 2 +- .../impl/WxBillDepositServiceImpl.java | 19 ++++++++++++++++++- .../WxBillPropertyDepositServiceImpl.java | 19 ++++++++++++++++++- 6 files changed, 40 insertions(+), 6 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillDepositController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillDepositController.java index fa09c2d74..cf046629b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillDepositController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillDepositController.java @@ -87,7 +87,7 @@ public class WxBillDepositController extends BaseController { @SystemControllerLog(description = "租赁押金-退回押金") public ResultData returnDeposit(@RequestBody WxBillDeposit wxBillDeposit) { logger.debug("[" + getIpAddr() + "] WxBillDepositController::returnDeposit"); - return wxBillDepositService.returnDeposit(wxBillDeposit); + return wxBillDepositService.returnDeposit(wxBillDeposit, getUser()); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillPropertyDepositController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillPropertyDepositController.java index e53c8aa1c..77b54641d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillPropertyDepositController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillPropertyDepositController.java @@ -86,7 +86,7 @@ public class WxBillPropertyDepositController extends BaseController { @SystemControllerLog(description = "物业押金账单-退回押金") public ResultData returnDeposit(@RequestBody WxBillPropertyDeposit wxBillPropertyDeposit) { logger.debug("[" + getIpAddr() + "] WxBillPropertyDepositController::returnDeposit"); - return wxBillPropertyDepositService.returnDeposit(wxBillPropertyDeposit); + return wxBillPropertyDepositService.returnDeposit(wxBillPropertyDeposit, getUser()); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillDepositService.java b/mallinkService/src/main/java/com/iformall/service/WxBillDepositService.java index 32c8b9ceb..5bd145511 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillDepositService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillDepositService.java @@ -47,7 +47,7 @@ public interface WxBillDepositService { ResultData updatePaid(Long id); - ResultData returnDeposit(WxBillDeposit wxBillDeposit); + ResultData returnDeposit(WxBillDeposit wxBillDeposit, MallUserInfo user); ResultData adjustDeposit(WxBillDeposit wxBillDeposit); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillPropertyDepositService.java b/mallinkService/src/main/java/com/iformall/service/WxBillPropertyDepositService.java index 39f62dbe7..832446725 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillPropertyDepositService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillPropertyDepositService.java @@ -50,7 +50,7 @@ public interface WxBillPropertyDepositService { ResultData updatePaid(Long id); - ResultData returnDeposit(WxBillPropertyDeposit wxBillPropertyDeposit); + ResultData returnDeposit(WxBillPropertyDeposit wxBillPropertyDeposit, MallUserInfo user); ResultData adjustDeposit(WxBillPropertyDeposit wxBillPropertyDeposit); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java index cc9585b3e..433a0d55a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java @@ -189,7 +189,7 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { @Transactional(rollbackFor = {Exception.class}) @Override - public ResultData returnDeposit(WxBillDeposit record) { + public ResultData returnDeposit(WxBillDeposit record, MallUserInfo user) { logger.info("租赁押金退还"); WxBillDeposit wxBillDeposit = wxBillDepositMapper.selectByPrimaryKey(record.getId()); if (wxBillDeposit == null) { @@ -204,6 +204,23 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { logger.error("租赁押金退还失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); } + //日志 + WxBillAction wxBillAction = new WxBillAction(); + wxBillAction.setBillId(wxBillDeposit.getId()); + String message = EnumBillPayWay.getEnum(record.getPayWay()).getMessage(); + String price = new BigDecimal(record.getReturnPrice()).divide(new BigDecimal(100)).toPlainString(); + wxBillAction.setDetails(message + price + "元"); + wxBillAction.setAction(EnumBillAction.DEPOSIT_RETURN.getCode()); + wxBillAction.setUserId(user.getId()); + wxBillAction.setUserName(user.getName()); + wxBillAction.setPhone(user.getPhone()); + wxBillAction.setTenantId(wxBillDeposit.getTenantId()); + try { + wxBillActionService.save(wxBillAction); + } catch (Exception e) { + logger.error("添加租赁押金账单行为日志,e:" + e.getMessage()); + throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); + } return new ResultData(Result.SUCCESS, "租赁押金退还成功", wxBillDeposit); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java index e473a3e29..da40c0953 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java @@ -188,7 +188,7 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe } @Override - public ResultData returnDeposit(WxBillPropertyDeposit record) { + public ResultData returnDeposit(WxBillPropertyDeposit record, MallUserInfo user) { logger.info("物业押金退还"); WxBillPropertyDeposit wxBillDeposit = wxBillPropertyDepositMapper.selectByPrimaryKey(record.getId()); if (wxBillDeposit == null) { @@ -203,6 +203,23 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe logger.error("物业押金退还失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); } + //日志 + WxBillAction wxBillAction = new WxBillAction(); + wxBillAction.setBillId(wxBillDeposit.getId()); + String message = EnumBillPayWay.getEnum(record.getPayWay()).getMessage(); + String price = new BigDecimal(record.getReturnPrice()).divide(new BigDecimal(100)).toPlainString(); + wxBillAction.setDetails(message + price + "元"); + wxBillAction.setAction(EnumBillAction.DEPOSIT_RETURN.getCode()); + wxBillAction.setUserId(user.getId()); + wxBillAction.setUserName(user.getName()); + wxBillAction.setPhone(user.getPhone()); + wxBillAction.setTenantId(wxBillDeposit.getTenantId()); + try { + wxBillActionService.save(wxBillAction); + } catch (Exception e) { + logger.error("添加物业押金账单行为日志,e:" + e.getMessage()); + throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); + } return new ResultData(Result.SUCCESS, "物业押金退还成功", wxBillDeposit); }