| @@ -8,6 +8,7 @@ import com.iformall.domain.po.MallUserInfo; | |||||
| import com.iformall.domain.po.WxBillProperty; | import com.iformall.domain.po.WxBillProperty; | ||||
| import com.iformall.domain.po.WxPropertyContract; | import com.iformall.domain.po.WxPropertyContract; | ||||
| import com.iformall.enums.EnumRentStartType; | import com.iformall.enums.EnumRentStartType; | ||||
| import com.iformall.exception.MallinkException; | |||||
| import com.iformall.mapper.WxPropertyContractMapper; | import com.iformall.mapper.WxPropertyContractMapper; | ||||
| import com.iformall.service.WxBillPropertyService; | import com.iformall.service.WxBillPropertyService; | ||||
| import com.iformall.service.WxPropertyContractService; | import com.iformall.service.WxPropertyContractService; | ||||
| @@ -107,8 +108,13 @@ public class WxPropertyContractController extends BaseController { | |||||
| WxBillProperty wxBillProperty = new WxBillProperty(); | WxBillProperty wxBillProperty = new WxBillProperty(); | ||||
| wxBillProperty.setTenantId(super.getTenantId()); | wxBillProperty.setTenantId(super.getTenantId()); | ||||
| wxBillPropertyService.updateBillStatus(wxBillProperty); | wxBillPropertyService.updateBillStatus(wxBillProperty); | ||||
| Map<String, Object> data = wxPropertyContractService.getById(id); | |||||
| return new ResultData(data); | |||||
| try { | |||||
| Map<String, Object> data = wxPropertyContractService.getById(id); | |||||
| return new ResultData(data); | |||||
| } catch (MallinkException e) { | |||||
| logger.error(e.getMessage()); | |||||
| return new ResultData(e.getErrorCode(), e.getMessage()); | |||||
| } | |||||
| } | } | ||||
| @RequestMapping("/download") | @RequestMapping("/download") | ||||
| @@ -7,6 +7,7 @@ import com.iformall.domain.po.WxBillProperty; | |||||
| import com.iformall.domain.po.WxPropertyContract; | import com.iformall.domain.po.WxPropertyContract; | ||||
| import com.iformall.domain.po.WxRentContract; | import com.iformall.domain.po.WxRentContract; | ||||
| import com.iformall.domain.vo.WxRentPropertyContractVo; | import com.iformall.domain.vo.WxRentPropertyContractVo; | ||||
| import com.iformall.exception.MallinkException; | |||||
| import com.iformall.mapper.WxPropertyContractMapper; | import com.iformall.mapper.WxPropertyContractMapper; | ||||
| import com.iformall.mapper.WxRentContractMapper; | import com.iformall.mapper.WxRentContractMapper; | ||||
| import com.iformall.service.WxPropertyContractService; | import com.iformall.service.WxPropertyContractService; | ||||
| @@ -71,8 +72,12 @@ public class WxRentPropertyContractServiceImpl implements WxRentPropertyContract | |||||
| wxPropertyContractQuery.setRentContractId(id); | wxPropertyContractQuery.setRentContractId(id); | ||||
| WxPropertyContract propertyContract = wxPropertyContractMapper.selectOne(wxPropertyContractQuery); | WxPropertyContract propertyContract = wxPropertyContractMapper.selectOne(wxPropertyContractQuery); | ||||
| if (propertyContract != null) { | if (propertyContract != null) { | ||||
| Map<String, Object> property = wxPropertyContractService.getById(propertyContract.getId()); | |||||
| data.put("property", property); | |||||
| try { | |||||
| Map<String, Object> property = wxPropertyContractService.getById(propertyContract.getId()); | |||||
| data.put("property", property); | |||||
| } catch (MallinkException e) { | |||||
| logger.error(e.getMessage()); | |||||
| } | |||||
| } | } | ||||
| return new ResultData(data); | return new ResultData(data); | ||||
| } | } | ||||