From 7cb977795a60b76fb0b5e0a07721d0bdcea234f9 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 18 Jun 2019 13:50:59 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=A7=9F=E8=B5=81=E7=89=A9=E4=B8=9A=E5=90=88?= =?UTF-8?q?=E5=90=8C][=E4=BF=AE=E6=94=B9][=E6=9B=B4=E6=96=B0=E5=90=88?= =?UTF-8?q?=E5=90=8C=E7=8A=B6=E6=80=81]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/contract/WxRentContractController.java | 2 +- .../iformall/service/impl/WxRentContractServiceImpl.java | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java index 4ac1c9514..350a54e38 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -236,7 +236,7 @@ public class WxRentContractController extends BaseController { @PostMapping("updateRentContractStatus") @SystemControllerLog(description = "租赁合同-更新合同状态") - public ResultData updateRentContractStatus(@ModelAttribute WxRentContract wxRentContract) { + public ResultData updateRentContractStatus(@RequestBody WxRentContract wxRentContract) { logger.debug("[" + getIpAddr() + "] WxRentContractController::updateRentContractStatus"); return wxRentContractService.updateRentContractStatus(wxRentContract.getId()); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 7a8ecdbd2..6be82c0ce 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -1360,11 +1360,10 @@ public class WxRentContractServiceImpl implements WxRentContractService { //押金 buildDeposit(wxMerchant, null,id); updatePropertyPreviewBill(record); - - + //作废合同 + updateInvalidContract(id); } - //作废合同 - updateInvalidContract(id); + return new ResultData(Result.SUCCESS, "操作成功"); }