From 8f7259c42c99177fb4bb80de9bb055950dc2c972 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Fri, 5 Jul 2019 11:10:31 +0800 Subject: [PATCH] =?UTF-8?q?[ProperTyContract/findById][=E4=BF=AE=E6=94=B9]?= =?UTF-8?q?:=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contract/WxPropertyContractController.java | 10 ++++++++-- .../impl/WxRentPropertyContractServiceImpl.java | 9 +++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java index fc0ddd668..7c3ec44e9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java @@ -8,6 +8,7 @@ import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxBillProperty; import com.iformall.domain.po.WxPropertyContract; import com.iformall.enums.EnumRentStartType; +import com.iformall.exception.MallinkException; import com.iformall.mapper.WxPropertyContractMapper; import com.iformall.service.WxBillPropertyService; import com.iformall.service.WxPropertyContractService; @@ -107,8 +108,13 @@ public class WxPropertyContractController extends BaseController { WxBillProperty wxBillProperty = new WxBillProperty(); wxBillProperty.setTenantId(super.getTenantId()); wxBillPropertyService.updateBillStatus(wxBillProperty); - Map data = wxPropertyContractService.getById(id); - return new ResultData(data); + try { + Map data = wxPropertyContractService.getById(id); + return new ResultData(data); + } catch (MallinkException e) { + logger.error(e.getMessage()); + return new ResultData(e.getErrorCode(), e.getMessage()); + } } @RequestMapping("/download") diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java index 49f94c4e4..5f11d9121 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java @@ -7,6 +7,7 @@ import com.iformall.domain.po.WxBillProperty; import com.iformall.domain.po.WxPropertyContract; import com.iformall.domain.po.WxRentContract; import com.iformall.domain.vo.WxRentPropertyContractVo; +import com.iformall.exception.MallinkException; import com.iformall.mapper.WxPropertyContractMapper; import com.iformall.mapper.WxRentContractMapper; import com.iformall.service.WxPropertyContractService; @@ -71,8 +72,12 @@ public class WxRentPropertyContractServiceImpl implements WxRentPropertyContract wxPropertyContractQuery.setRentContractId(id); WxPropertyContract propertyContract = wxPropertyContractMapper.selectOne(wxPropertyContractQuery); if (propertyContract != null) { - Map property = wxPropertyContractService.getById(propertyContract.getId()); - data.put("property", property); + try { + Map property = wxPropertyContractService.getById(propertyContract.getId()); + data.put("property", property); + } catch (MallinkException e) { + logger.error(e.getMessage()); + } } return new ResultData(data); }