| @@ -75,12 +75,7 @@ public class WxPropertyContractController extends WxContractBaseController { | |||||
| @SystemControllerLog(description = "物业合同-新增") | @SystemControllerLog(description = "物业合同-新增") | ||||
| public ResultData add(@RequestBody WxPropertyContract wxPropertyContract) { | public ResultData add(@RequestBody WxPropertyContract wxPropertyContract) { | ||||
| logger.debug("[" + getIpAddr() + "] WxPropertyContractController::add"); | logger.debug("[" + getIpAddr() + "] WxPropertyContractController::add"); | ||||
| //MallUserInfo user = getUser(); | |||||
| MallUserInfo user = new MallUserInfo(); | |||||
| user.setId(321127266275430400L); | |||||
| user.setName("alitest"); | |||||
| user.setTenantId("789"); | |||||
| user.setParentTenantId("788"); | |||||
| MallUserInfo user = getUser(); | |||||
| wxPropertyContract.updateTenantInfo(user); | wxPropertyContract.updateTenantInfo(user); | ||||
| wxPropertyContract.setAdjustPeriodHandle(); | wxPropertyContract.setAdjustPeriodHandle(); | ||||
| Integer contractType = wxRentPropertyContractService.getContractType(wxPropertyContract.getRentShopType(), wxPropertyContract.getOperationType(), EnumContractType.PROPERTY.getCode()); | Integer contractType = wxRentPropertyContractService.getContractType(wxPropertyContract.getRentShopType(), wxPropertyContract.getOperationType(), EnumContractType.PROPERTY.getCode()); | ||||
| @@ -215,7 +215,7 @@ public class WxRentContractController extends WxContractBaseController { | |||||
| try { | try { | ||||
| update = wxRentContractService.update(rentContract, user.getId(), user.getName(), EnumFromType.OTHER.getCode(), oldDate); | update = wxRentContractService.update(rentContract, user.getId(), user.getName(), EnumFromType.OTHER.getCode(), oldDate); | ||||
| } catch (MallinkException e) { | } catch (MallinkException e) { | ||||
| return new ResultData(ErrorCode.SYS_SERVER_ERROR); | |||||
| return new ResultData(update.code,update.message); | |||||
| } | } | ||||
| return update; | return update; | ||||
| }else { | }else { | ||||
| @@ -327,7 +327,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||||
| propertyContractQuery.setRentContractId(record.getRentContractId()); | propertyContractQuery.setRentContractId(record.getRentContractId()); | ||||
| int propertyContractCount = wxPropertyContractMapper.selectCount(new QueryWrapper(propertyContractQuery)); | int propertyContractCount = wxPropertyContractMapper.selectCount(new QueryWrapper(propertyContractQuery)); | ||||
| if (propertyContractCount > 0) { | if (propertyContractCount > 0) { | ||||
| throw new MallinkException(ErrorCode.SYS_SERVER_ERROR); | |||||
| throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),"租金合同编号["+record.getRentContractId()+"]存在关联的物业合同"); | |||||
| } | } | ||||
| } | } | ||||
| hasFlow = false; | hasFlow = false; | ||||
| @@ -401,10 +401,10 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||||
| // record.setStatus(EnumRentContractStatus.INTENTION.getCode()); | // record.setStatus(EnumRentContractStatus.INTENTION.getCode()); | ||||
| // } | // } | ||||
| if (CollectionUtils.isEmpty(record.getFlowParams())) { | |||||
| hasFlow = false; | |||||
| record.setApplyStatus(EnumRentContractAppStatus.DEFAULT.getCode()); | |||||
| } | |||||
| // if (CollectionUtils.isEmpty(record.getFlowParams())) { | |||||
| // hasFlow = false; | |||||
| // record.setApplyStatus(EnumRentContractAppStatus.DEFAULT.getCode()); | |||||
| // } | |||||
| try { | try { | ||||
| wxPropertyContractMapper.updateById(record); | wxPropertyContractMapper.updateById(record); | ||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| @@ -234,6 +234,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| WxPropertyContract propertyContract = new WxPropertyContract(); | WxPropertyContract propertyContract = new WxPropertyContract(); | ||||
| propertyContract.setRentContractId(id); | propertyContract.setRentContractId(id); | ||||
| result.put("propertyOweCount",wxPropertyContractMapper.queryOweCount(propertyContract)); | result.put("propertyOweCount",wxPropertyContractMapper.queryOweCount(propertyContract)); | ||||
| result.put("protertyContract", wxPropertyContractMapper.findOneByRentId(wxRentContract)); | |||||
| //押金欠缴 | //押金欠缴 | ||||
| result.put("depositOweCount",wxBillDepositMapper.queryOweCount(wxRentContract)); | result.put("depositOweCount",wxBillDepositMapper.queryOweCount(wxRentContract)); | ||||
| //押金状态 | //押金状态 | ||||