From b75fbf23d2c6f11172fe39b7873cef5fe1dd6911 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 12 Nov 2018 16:11:59 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=89=A9=E4=B8=9A=E5=90=88=E5=90=8C][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E9=80=89=E6=8B=A9=E5=BA=97=E9=93=BA?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=85=B3=E8=81=94=E7=9A=84=E5=90=88=E5=90=8C?= =?UTF-8?q?=E5=A6=82=E6=9E=9C=E5=B7=B2=E7=BB=88=E6=AD=A2=E5=B0=86=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E4=BF=A1=E6=81=AF]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WxPropertyContractController.java | 8 +++++++- .../service/WxPropertyContractService.java | 2 ++ .../impl/WxPropertyContractServiceImpl.java | 20 +++++++++++++++++++ 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxPropertyContractController.java index 2863c5d88..3176b7e14 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxPropertyContractController.java @@ -91,5 +91,11 @@ public class WxPropertyContractController extends BaseController public ResultData endPropertyContractByRentContractId(Long rentContractId) { return wxPropertyContractService.endPropertyContractByRentContractId(rentContractId); } - + + @GetMapping("/hasRentContract") + @ApiImplicitParam(name = "rentContractId", value = "rentContractId", dataType = "Long", paramType = "query", required = true) + public ResultData hasRentContract(Long rentContractId) { + return wxPropertyContractService.hasRentContract(rentContractId); + } + } diff --git a/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java b/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java index 9d60f7a45..69b8d6b66 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java @@ -56,4 +56,6 @@ public interface WxPropertyContractService { ResultData endPropertyContractByRentContractId(Long rentContractId); + ResultData hasRentContract(Long rentContractId); + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 7914d8b71..0ac263d5c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -457,6 +457,26 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService return new ResultData(Result.SUCCESS, "操作成功"); } + @Override + public ResultData hasRentContract(Long rentContractId) { + if(null==rentContractId){ + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"rentContractId不能为空"); + } + + WxRentContract wxRentContract = wxRentContractMapper.selectByPrimaryKey(rentContractId); + if(null==wxRentContract){ + return new ResultData(ErrorCode.RENT_CONTRACT_IS_NOT_FOUND); + } + + if(wxRentContract.getStatus().equals(EnumRentContractStatus.CONTRACT_TERMINATE.getCode()) || + wxRentContract.getStatus().equals(EnumRentContractStatus.WAIT_SIGN.getCode()) || + wxRentContract.getStatus().equals(EnumRentContractStatus.INVALID.getCode())){ + return new ResultData(true); + } + + return new ResultData(false); + } + public Map updateStatus(String tenantId) { Map resultData = new HashMap(); WxPropertyContract wxRentContract = new WxPropertyContract();