From b9ae4f675e01517280a893d4c10e9f676d4216ef Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Fri, 28 Dec 2018 21:51:06 +0800 Subject: [PATCH] =?UTF-8?q?[rentcontract][=E4=BF=AE=E6=94=B9]:updateRentCo?= =?UTF-8?q?ntractStatus=E6=B7=BB=E5=8A=A0=E7=A9=BA=E6=8C=87=E9=92=88?= =?UTF-8?q?=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxRentContractServiceImpl.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) 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 46c528692..bd25c5bba 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -702,6 +702,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { @Override public ResultData updateRentContractStatus(Long id) { + if(id == null) { + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); + } //更新合同状态为签约 WxRentContract wxRentContract = new WxRentContract(); wxRentContract.setId(id); @@ -709,8 +712,12 @@ public class WxRentContractServiceImpl implements WxRentContractService { wxRentContractMapper.updateByPrimaryKeySelective(wxRentContract); //建立账单 WxRentContract record = wxRentContractMapper.selectByPrimaryKey(id); - if (record.getMerchantId() != null && record.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode()) - && record.getReceivePeriod() != null && record.getDeposit() > 0 && record.getPrice() > 0) { + if (record != null && + record.getMerchantId() != null && + record.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode()) && + record.getReceivePeriod() != null && + record.getDeposit() > 0 && + record.getPrice() > 0) { WxBillRent wxBillRent = new WxBillRent(); wxBillRent.setMerchantId(record.getMerchantId()); List> billRentList = wxBillRentMapper.queryBillRentList(wxBillRent);