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, "操作成功"); }