From bb3f8ef435a2efde11ba735418922d6765501014 Mon Sep 17 00:00:00 2001 From: winter <664946893@qq.com> Date: Sat, 14 Jun 2025 17:14:24 +0800 Subject: [PATCH] fix --- .../contract/WxAgileContractController.java | 9 +-- .../contract/WxRentContractController.java | 58 +++++++++---------- .../impl/WxAgileContractServiceImpl.java | 9 ++- 3 files changed, 38 insertions(+), 38 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxAgileContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxAgileContractController.java index 078f974e5..59f516fc9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxAgileContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxAgileContractController.java @@ -674,8 +674,7 @@ public class WxAgileContractController extends WxContractBaseController { //转签 @PostMapping("transfer") public ResultData transfer(@RequestBody WxRentContract wxRentContract) { - if (null == wxRentContract.getId() || null == wxRentContract.getCustomerType() || - StringUtils.isBlank(wxRentContract.getCustomerName()) || StringUtils.isBlank(wxRentContract.getCustomerPhone())){ + if (null == wxRentContract.getId() || null == wxRentContract.getCustomersId()){ return new ResultData(Result.ERROR, "缺少参数"); } @@ -688,12 +687,6 @@ public class WxAgileContractController extends WxContractBaseController { try { rentContract.setCustomersId(wxRentContract.getCustomersId()); - rentContract.setCustomerType(wxRentContract.getCustomerType()); - rentContract.setCustomerName(wxRentContract.getCustomerName()); - rentContract.setCustomerLinkPerson(wxRentContract.getCustomerLinkPerson()); - rentContract.setCustomerPhone(wxRentContract.getCustomerPhone()); - rentContract.setCustomerLegalPerson(wxRentContract.getCustomerLegalPerson()); - wxAgileContractService.transfer(rentContract,user); }catch(Exception e) { logger.error("transfer error.",e); 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 942c04b38..c29fd6252 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -77,35 +77,35 @@ public class WxRentContractController extends WxContractBaseController { return new ResultData(map); } - /** - * 作废 - * @param wxRentContract - * @return - */ - @PostMapping("/unvalid") - @SystemControllerLog(description = "租金合同-作废合同") - public ResultData unvalid(@RequestBody WxRentContract wxRentContract) { - WxRentContract contract = wxRentContractService.getSimpleDeatil(wxRentContract.getId()); - if (null == contract) { - return new ResultData(Result.ERROR, "合同不存在."); - } - MallUserInfo user = this.getUser(); - if (contract.getStatus().intValue() == EnumRentContractStatus.UNWRITE.getCode().intValue() || - contract.getStatus().intValue() == EnumRentContractStatus.DRAFT.getCode().intValue() || - (contract.getStatus().intValue() == EnumRentContractStatus.PERFORMANCE.getCode().intValue() - && (contract.getApplyStatus().intValue() == EnumRentContractAppStatus.REJECT.getCode().intValue() || - contract.getApplyStatus().intValue() == EnumRentContractAppStatus.SETBACK.getCode().intValue()))) { - contract.setStatus(EnumRentContractStatus.INVALID.getCode()); - contract.setUpdatetime(new Date()); - contract.setUpdateBy(user.getId()); - wxRentContractService.updateRentContract(contract); - //删除预览的账单 - wxRentContractService.deletePrewBill(contract); - return new ResultData(); - }else { - return new ResultData(Result.ERROR, "合同状态不允许作废.只能作废草稿或者履约拒绝的合同。"); - } - } +// /** +// * 作废 +// * @param wxRentContract +// * @return +// */ +// @PostMapping("/unvalid") +// @SystemControllerLog(description = "租金合同-作废合同") +// public ResultData unvalid(@RequestBody WxRentContract wxRentContract) { +// WxRentContract contract = wxRentContractService.getSimpleDeatil(wxRentContract.getId()); +// if (null == contract) { +// return new ResultData(Result.ERROR, "合同不存在."); +// } +// MallUserInfo user = this.getUser(); +// if (contract.getStatus().intValue() == EnumRentContractStatus.UNWRITE.getCode().intValue() || +// contract.getStatus().intValue() == EnumRentContractStatus.DRAFT.getCode().intValue() || +// (contract.getStatus().intValue() == EnumRentContractStatus.PERFORMANCE.getCode().intValue() +// && (contract.getApplyStatus().intValue() == EnumRentContractAppStatus.REJECT.getCode().intValue() || +// contract.getApplyStatus().intValue() == EnumRentContractAppStatus.SETBACK.getCode().intValue()))) { +// contract.setStatus(EnumRentContractStatus.INVALID.getCode()); +// contract.setUpdatetime(new Date()); +// contract.setUpdateBy(user.getId()); +// wxRentContractService.updateRentContract(contract); +// //删除预览的账单 +// wxRentContractService.deletePrewBill(contract); +// return new ResultData(); +// }else { +// return new ResultData(Result.ERROR, "合同状态不允许作废.只能作废草稿或者履约拒绝的合同。"); +// } +// } /** * 终止 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxAgileContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxAgileContractServiceImpl.java index 35352ae39..629293ddb 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxAgileContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxAgileContractServiceImpl.java @@ -1349,10 +1349,17 @@ public class WxAgileContractServiceImpl implements WxAgileContractService { } return yearList; } - + + @Transactional(rollbackFor = {Exception.class}) @Override public void deleteContract(Long id, TenantEntity tenantEntity) { wxRentContractMapper.deleteById(id); + //删除草稿状态的账单 + WxAllBill brDel = new WxAllBill(); + brDel.setRentContractId(id); + brDel.updateTenantInfo(tenantEntity); + brDel.setIsPreview(EnumYesOrNo.YES.getCode()); + wxAllBillMapper.deletePreviewBill(brDel); } // @Transactional(rollbackFor = {Exception.class})