From faea00a3bd5f67e25d31f1861fd18d74131c144c Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Tue, 25 Aug 2020 10:17:55 +0800 Subject: [PATCH] fix contract --- .../contract/WxRentContractController.java | 13 ++++++++++--- .../service/impl/WxPropertyContractServiceImpl.java | 7 ++++--- 2 files changed, 14 insertions(+), 6 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 a36a5dbac..57994e72a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -366,10 +366,17 @@ public class WxRentContractController extends WxContractBaseController { @SystemControllerLog(description = "租赁合同-终止合同") public ResultData endContract(@RequestBody WxRentContract wxRentContract) { logger.debug("[" + getIpAddr() + "] WxRentContractController::endContract"); - wxRentContract.updateTenantInfo(getTenantInfo()); + WxRentContract contract = wxRentContractMapper.selectById(wxRentContract.getId()); + if (contract == null) { + return new ResultData(ErrorCode.RENT_CONTRACT_IS_NOT_FOUND); + } + wxRentContract.updateTenantInfo(contract); wxRentContractService.endContract(wxRentContract); - if(wxRentContract.getOperationType().intValue() == EnumContractOperationType.WHOLE.getCode().intValue()) { - wxPropertyContractService.updatePropertyContractStatus(wxRentContract.getPropertyId()); + //租金+物业的终止 + if(contract.getOperationType().intValue() == EnumContractOperationType.WHOLE.getCode().intValue()) { + WxPropertyContract wpc = new WxPropertyContract(); + wpc.setId(wxRentContract.getPropertyId()); + wxPropertyContractService.endContract(wpc); } return new ResultData(); } 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 554912323..5ed628465 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -179,10 +179,11 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService } //关联的店铺 - if (wxRentContract != null) { + WxRentContract wrc = wxRentContractMapper.selectById(wxPropertyContract.getRentContractId()); + if (wrc != null) { WxShop record = new WxShop(); - if (null != wxRentContract.shopIdsByRentInfo() && wxRentContract.shopIdsByRentInfo().size()>0) { - record.setIds(wxRentContract.shopIdsByRentInfo()); + if (null != wrc.shopIdsByRentInfo() && wrc.shopIdsByRentInfo().size()>0) { + record.setIds(wrc.shopIdsByRentInfo()); List> list = wxShopMapper.findListMap(record); result.put("wxShops", list); }else {