From a0845e5eeab5507573b455fe569ba3050c65ee03 Mon Sep 17 00:00:00 2001 From: luozukai Date: Tue, 18 Jun 2019 16:16:10 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=A1=E6=89=B9][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=9A=E5=BE=84=E5=90=88=E5=90=8C]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/service/impl/WxPropertyContractServiceImpl.java | 2 +- .../com/iformall/service/impl/WxRentContractServiceImpl.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) 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 efd3ecdd8..4462a78ca 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -390,7 +390,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService wxPropertyContractMapper.updateByPrimaryKeySelective(wxPropertyContract); //建立账单 WxPropertyContract record = wxPropertyContractMapper.selectByPrimaryKey(id); - if (record.getMerchantId() != null && record.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode()) + if (record.getMerchantId() != null && record.getReceivePeriod() != null && record.getPrice() > 0) { //预览账单改为正式,并写入商户id updatePropertyPreviewBill(record); 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 6be82c0ce..b6049d1a2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -1345,7 +1345,6 @@ public class WxRentContractServiceImpl implements WxRentContractService { //建立账单 if (record != null && record.getMerchantId() != null && - record.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode()) && record.getReceivePeriod() != null && record.getPrice() > 0) { //预览账单改为正式,并写入商户id