From d6e09fa1ff85c144735a28defc6164f06189c4be Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Fri, 11 Sep 2020 15:35:08 +0800 Subject: [PATCH] fix contract bill bug --- .../controller/contract/WxRentContractController.java | 2 +- .../java/com/iformall/service/WxRentContractService.java | 2 +- .../java/com/iformall/service/impl/WxFlowServiceImpl.java | 2 +- .../iformall/service/impl/WxRentContractServiceImpl.java | 7 +++++-- 4 files changed, 8 insertions(+), 5 deletions(-) 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 a8b66e0dc..6ce6554cf 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -553,7 +553,7 @@ public class WxRentContractController extends WxContractBaseController { return new ResultData(Result.ERROR,e.getMessage()); } - wxRentContractService.updateRentContractStatus(wxRentContract.getId()); + wxRentContractService.updateRentContractStatus(wxRentContract.getId(),false); if(contract.getOperationType().intValue() == EnumContractOperationType.WHOLE.getCode().intValue()) { wxPropertyContractService.updatePropertyContractStatus(wxRentContract.getPropertyId()); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java index 7acaf5001..b2cab7d95 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java @@ -68,7 +68,7 @@ public interface WxRentContractService { ResultData updateFile(WxRentContract wxRentContract, Long userId,String userName,Date oldRentStartDate,boolean writeComplate); - ResultData updateRentContractStatus(Long id); + ResultData updateRentContractStatus(Long id,boolean buildPropertyBill); List getShopIds(WxRentContract record) ; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index 30ec7e51d..12ba2d70f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -216,7 +216,7 @@ public class WxFlowServiceImpl implements WxFlowService { } //如果审批完成 }else if (EnumRentContractAppStatus.FINISH.getCode().intValue() == applyStatus.intValue()) { - wxRentContractService.updateRentContractStatus(bsId); + wxRentContractService.updateRentContractStatus(bsId,false); if (isrentproperty) { wxPropertyContractService.updatePropertyContractStatus(propetyId); } 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 d1baa8b3b..6c250e749 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -1635,7 +1635,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { } @Override - public ResultData updateRentContractStatus(Long id) { + public ResultData updateRentContractStatus(Long id,boolean buildProperyBill) { if (id == null) { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); } @@ -1678,7 +1678,10 @@ public class WxRentContractServiceImpl implements WxRentContractService { //押金 buildDeposit( null, id); } - updatePropertyPreviewBill(record); + //一起建立物业账单 + if (buildProperyBill) { + updatePropertyPreviewBill(record); + } //作废合同 //updateInvalidContract(id); }