From f5b4e3cc51121060041b61610909d8d872c92477 Mon Sep 17 00:00:00 2001 From: luozukai Date: Wed, 31 Jul 2019 15:04:57 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=B4=A6=E5=8D=95][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=BB=9E=E7=BA=B3=E9=87=91]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxPropertyContractServiceImpl.java | 7 ++++--- .../service/impl/WxRentContractServiceImpl.java | 11 ++++++----- 2 files changed, 10 insertions(+), 8 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 9198828cb..f22edd0c3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -452,8 +452,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService //建立账单 if (record.getMerchantId() != null && record.getReceivePeriod() != null && - record.getPrice() > 0 && - record.getDeposit() > 0) { + record.getPrice() > 0) { //预览账单改为正式,并写入商户id updatePropertyPreviewBill(record); } @@ -467,7 +466,9 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService billProperty.setIsPreview(EnumIsPreview.NO.getCode()); billProperty.setMerchantId(record.getMerchantId()); wxBillPropertyMapper.updatePreviewStatus(billProperty); - buildDeposit(record); + if(record.getDeposit() > 0) { + buildDeposit(record); + } } @Transactional(rollbackFor = {Exception.class}) 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 8d80835a6..43c33f407 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -1461,8 +1461,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { if (record != null && record.getMerchantId() != null && record.getReceivePeriod() != null && - record.getPrice() > 0 && - record.getDeposit() > 0) { + record.getPrice() > 0 ) { //预览账单改为正式,并写入商户id WxBillRent billRent = new WxBillRent(); billRent.setRentContractId(id); @@ -1472,9 +1471,11 @@ public class WxRentContractServiceImpl implements WxRentContractService { WxMerchant wxMerchant = new WxMerchant(); wxMerchant.setId(record.getMerchantId()); wxMerchant.setTenantId(record.getTenantId()); - //押金 - buildDeposit(wxMerchant, null,id); - updatePropertyPreviewBill(record); + if(record.getDeposit() > 0) { + //押金 + buildDeposit(wxMerchant, null, id); + updatePropertyPreviewBill(record); + } //作废合同 updateInvalidContract(id); }