From 1e00b9f961c864b5d93b5a920b7851fd67d8736a Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Mon, 24 Aug 2020 15:27:40 +0800 Subject: [PATCH] fix --- .../contract/WxPropertyContractController.java | 7 +------ .../controller/contract/WxRentContractController.java | 2 +- .../service/impl/WxPropertyContractServiceImpl.java | 10 +++++----- .../service/impl/WxRentContractServiceImpl.java | 1 + 4 files changed, 8 insertions(+), 12 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 4676fc68d..980e4e4f2 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java @@ -75,12 +75,7 @@ public class WxPropertyContractController extends WxContractBaseController { @SystemControllerLog(description = "物业合同-新增") public ResultData add(@RequestBody WxPropertyContract wxPropertyContract) { 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.setAdjustPeriodHandle(); Integer contractType = wxRentPropertyContractService.getContractType(wxPropertyContract.getRentShopType(), wxPropertyContract.getOperationType(), EnumContractType.PROPERTY.getCode()); 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 59890d707..7bcb5005d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -215,7 +215,7 @@ public class WxRentContractController extends WxContractBaseController { try { update = wxRentContractService.update(rentContract, user.getId(), user.getName(), EnumFromType.OTHER.getCode(), oldDate); } catch (MallinkException e) { - return new ResultData(ErrorCode.SYS_SERVER_ERROR); + return new ResultData(update.code,update.message); } return update; }else { 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 c05ce16c1..5ae2d5743 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -327,7 +327,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService propertyContractQuery.setRentContractId(record.getRentContractId()); int propertyContractCount = wxPropertyContractMapper.selectCount(new QueryWrapper(propertyContractQuery)); if (propertyContractCount > 0) { - throw new MallinkException(ErrorCode.SYS_SERVER_ERROR); + throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),"租金合同编号["+record.getRentContractId()+"]存在关联的物业合同"); } } hasFlow = false; @@ -401,10 +401,10 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService // 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 { wxPropertyContractMapper.updateById(record); } catch (Exception e) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 71eda3e25..a61a57523 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -234,6 +234,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { WxPropertyContract propertyContract = new WxPropertyContract(); propertyContract.setRentContractId(id); result.put("propertyOweCount",wxPropertyContractMapper.queryOweCount(propertyContract)); + result.put("protertyContract", wxPropertyContractMapper.findOneByRentId(wxRentContract)); //押金欠缴 result.put("depositOweCount",wxBillDepositMapper.queryOweCount(wxRentContract)); //押金状态