From 6e17447e06ef46fdda0dd7cce312974c727502a9 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 30 Jul 2019 19:17:36 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=90=88=E5=90=8C][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E6=8A=BC=E9=87=91=E7=94=9F=E6=88=90=E8=B4=A6=E5=8D=95]?= 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 | 2 +- 2 files changed, 2 insertions(+), 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 e042519d4..2bbcd18ec 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -472,7 +472,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService public void buildDeposit(WxPropertyContract record) { Long propertyContractId = record.getId(); WxPropertyContract wxPropertyContract = wxPropertyContractMapper.selectByPrimaryKey(propertyContractId); - if (wxPropertyContract != null) { + if (wxPropertyContract != null && wxPropertyContract.getDeposit() > 0) { //找到计租方式 int dayType = wxPropertyContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_DAY.getCode()) ? Calendar.DAY_OF_MONTH : Calendar.MONTH; final IdWorker idWorker = IdWorker.get(); 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 a9201fa2e..3794ccce8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -591,7 +591,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { @Override public void buildDeposit(WxMerchant wxMerchant, Long userId,Long rentContractId) { WxRentContract wxRentContract = wxRentContractMapper.selectByPrimaryKey(rentContractId); - if (wxRentContract != null) { + if (wxRentContract != null && wxRentContract.getDeposit() > 0) { final IdWorker idWorker = IdWorker.get(); WxBillDeposit wxBillDeposit = new WxBillDeposit(); wxBillDeposit.setId(idWorker.nextId());