From 1525b81a80666dae3463d8c6342915e09c1b0af8 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 12 Mar 2019 18:26:30 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=8A=BC=E9=87=91=E8=B4=A6=E5=8D=95][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E8=B0=83=E6=95=B4]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxBillDepositController.java | 7 ++++++ .../WxBillOtherDepositController.java | 7 ++++++ .../WxBillPropertyDepositController.java | 8 +++++++ .../java/com/iformall/common/ErrorCode.java | 3 ++- .../service/WxBillDepositService.java | 1 + .../service/WxBillOtherDepositService.java | 1 + .../service/WxBillPropertyDepositService.java | 2 ++ .../impl/WxBillDepositServiceImpl.java | 20 +++++++++++++++- .../impl/WxBillOtherDepositServiceImpl.java | 24 ++++++++++++++++--- .../WxBillPropertyDepositServiceImpl.java | 21 +++++++++++++++- 10 files changed, 88 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 1ad8ef3c6..42269299d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillDepositController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillDepositController.java @@ -83,5 +83,12 @@ public class WxBillDepositController extends BaseController { } + @PostMapping("adjustDeposit") + public ResultData adjustDeposit(@RequestBody WxBillDeposit wxBillDeposit) { + logger.debug("[" + getIpAddr() + "] WxBillDepositController::adjustDeposit"); + return wxBillDepositService.adjustDeposit(wxBillDeposit); + + } + } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillOtherDepositController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillOtherDepositController.java index 80e66589e..8cb3a99fe 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillOtherDepositController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillOtherDepositController.java @@ -83,4 +83,11 @@ public class WxBillOtherDepositController extends BaseController { } + @PostMapping("adjustDeposit") + public ResultData adjustDeposit(@RequestBody WxBillOtherDeposit wxBillDeposit) { + logger.debug("[" + getIpAddr() + "] WxBillOtherDepositController::adjustDeposit"); + return wxBillOtherDepositService.adjustDeposit(wxBillDeposit); + + } + } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillPropertyDepositController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillPropertyDepositController.java index 7bc9184d2..42e63b6cc 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillPropertyDepositController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillPropertyDepositController.java @@ -3,6 +3,7 @@ package com.iformall.controller; import com.github.pagehelper.PageInfo; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.domain.po.WxBillOtherDeposit; import com.iformall.domain.po.WxBillPropertyDeposit; import com.iformall.service.WxBillPropertyDepositService; import io.swagger.annotations.ApiImplicitParam; @@ -84,6 +85,13 @@ public class WxBillPropertyDepositController extends BaseController } + @PostMapping("adjustDeposit") + public ResultData adjustDeposit(@RequestBody WxBillPropertyDeposit wxBillPropertyDeposit) { + logger.debug("[" + getIpAddr() + "] WxBillPropertyDepositController::adjustDeposit"); + return wxBillPropertyDepositService.adjustDeposit(wxBillPropertyDeposit); + + } + } diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index 36911c642..7dfba11ac 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -309,9 +309,10 @@ public enum ErrorCode{ /** - * 物业押金账单 + * 押金账单 * */ BILL_PROPERTY_DEPOSIT_IS_NOT_FOUND(20000,"物业押金账单不存在"), + BILL_OTHER_DEPOSIT_IS_NOT_FOUND(200001, "其他押金账单不存在"), /** * 日常费用账单 diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillDepositService.java b/mallinkService/src/main/java/com/iformall/service/WxBillDepositService.java index 8ce9b8c40..8f9e3ca48 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillDepositService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillDepositService.java @@ -47,4 +47,5 @@ public interface WxBillDepositService { ResultData returnDeposit(WxBillDeposit wxBillDeposit); + ResultData adjustDeposit(WxBillDeposit wxBillDeposit); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillOtherDepositService.java b/mallinkService/src/main/java/com/iformall/service/WxBillOtherDepositService.java index 3f9e6dea7..556ad8c88 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillOtherDepositService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillOtherDepositService.java @@ -52,4 +52,5 @@ public interface WxBillOtherDepositService { ResultData returnDeposit(WxBillOtherDeposit wxBillDeposit); + ResultData adjustDeposit(WxBillOtherDeposit wxBillDeposit); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillPropertyDepositService.java b/mallinkService/src/main/java/com/iformall/service/WxBillPropertyDepositService.java index 8ab950042..6663d40bb 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillPropertyDepositService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillPropertyDepositService.java @@ -51,4 +51,6 @@ public interface WxBillPropertyDepositService { ResultData returnDeposit(WxBillPropertyDeposit wxBillPropertyDeposit); + 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 90d1a0241..99a641334 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java @@ -96,7 +96,7 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { int receivepay = record.getReceivePay().intValue(); int pay = record.getPay().intValue(); if(pay>receivepay){ - return new ResultData(ErrorCode.BILL_PAY_ERROR,"实收金额不能大于实际应收金额"); + return new ResultData(ErrorCode.BILL_PAY_ERROR.getCode(), "实收金额不能大于实际应收金额"); } if (record.getId() == null) { logger.info("新增租赁押金账单"); @@ -181,5 +181,23 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { return new ResultData(Result.SUCCESS, "租赁押金退还成功", wxBillDeposit); } + @Override + public ResultData adjustDeposit(WxBillDeposit record) { + logger.info("租赁押金调整"); + WxBillDeposit wxBillDeposit = wxBillDepositMapper.selectByPrimaryKey(record.getId()); + if (wxBillDeposit == null) { + return new ResultData(ErrorCode.BILL_RENT_DEPOSIT_IS_NOT_FOUND); + } + wxBillDeposit.setReceivePay(record.getReceivePay()); + wxBillDeposit.setUpdatetime(new Date()); + try { + wxBillDepositMapper.updateByPrimaryKeySelective(wxBillDeposit); + } 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/WxBillOtherDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java index b1f26e718..4246f7492 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java @@ -112,7 +112,7 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService int receivepay = record.getReceivePay().intValue(); int pay = record.getPay().intValue(); if (pay > receivepay) { - return new ResultData(ErrorCode.BILL_PAY_ERROR, "实收金额不能大于实际应收金额"); + return new ResultData(ErrorCode.BILL_PAY_ERROR.getCode(), "实收金额不能大于实际应收金额"); } if (record.getId() == null) { logger.info("新增其他账单"); @@ -182,10 +182,10 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService @Override public ResultData returnDeposit(WxBillOtherDeposit record) { - logger.info("租赁押金退还"); + logger.info("其他押金退还"); WxBillOtherDeposit wxBillDeposit = wxBillOtherDepositMapper.selectByPrimaryKey(record.getId()); if (wxBillDeposit == null) { - return new ResultData(ErrorCode.BILL_RENT_DEPOSIT_IS_NOT_FOUND); + return new ResultData(ErrorCode.BILL_OTHER_DEPOSIT_IS_NOT_FOUND); } wxBillDeposit.setReturnPrice(record.getReturnPrice()); wxBillDeposit.setStatus(EnumBillRentStatus.RETURN.getCode()); @@ -199,5 +199,23 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService return new ResultData(Result.SUCCESS, "租赁押金退还成功", wxBillDeposit); } + @Override + public ResultData adjustDeposit(WxBillOtherDeposit record) { + logger.info("其他押金调整"); + WxBillOtherDeposit wxBillDeposit = wxBillOtherDepositMapper.selectByPrimaryKey(record.getId()); + if (wxBillDeposit == null) { + return new ResultData(ErrorCode.BILL_OTHER_DEPOSIT_IS_NOT_FOUND); + } + wxBillDeposit.setReceivePay(record.getReceivePay()); + wxBillDeposit.setUpdatetime(new Date()); + try { + wxBillOtherDepositMapper.updateByPrimaryKeySelective(wxBillDeposit); + } 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 76eca94bb..b724252d2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java @@ -97,7 +97,7 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe int receivepay = record.getReceivePay().intValue(); int pay = record.getPay().intValue(); if(pay>receivepay){ - return new ResultData(ErrorCode.BILL_PAY_ERROR,"实收金额不能大于实际应收金额"); + return new ResultData(ErrorCode.BILL_PAY_ERROR.getCode(), "实收金额不能大于实际应收金额"); } if (record.getId() == null) { logger.info("新增物业押金账单"); @@ -182,4 +182,23 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe } + @Override + public ResultData adjustDeposit(WxBillPropertyDeposit record) { + logger.info("物业押金调整"); + WxBillPropertyDeposit wxBillDeposit = wxBillPropertyDepositMapper.selectByPrimaryKey(record.getId()); + if (wxBillDeposit == null) { + return new ResultData(ErrorCode.BILL_OTHER_DEPOSIT_IS_NOT_FOUND); + } + wxBillDeposit.setReceivePay(record.getReceivePay()); + wxBillDeposit.setUpdatetime(new Date()); + try { + wxBillPropertyDepositMapper.updateByPrimaryKeySelective(wxBillDeposit); + } 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); + } + + }