From a41a56653f75899945341c35fa68166489d5bc63 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 25 Feb 2019 15:09:18 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=8A=BC=E9=87=91][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E7=94=9F=E6=88=90=E8=B4=A6=E5=8D=95=E6=97=B6=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E4=B8=BA=E5=BE=85=E7=BC=B4(=E6=9C=AA=E7=BC=B4)]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/WxPropertyContractServiceImpl.java | 13 ++----------- .../service/impl/WxRentContractServiceImpl.java | 16 +++------------- 2 files changed, 5 insertions(+), 24 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 3c3b28709..316050bc9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -14,7 +14,6 @@ import com.iformall.service.WxFlowRecordService; import com.iformall.service.WxFlowService; import com.iformall.service.WxPropertyContractService; import com.iformall.utils.Constant; -import org.apache.commons.collections.map.HashedMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -372,16 +371,8 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService instance.setTime(wxBillDeposit.getReceiveDate()); instance.add(dayType, wxPropertyContract.getLease()); wxBillDeposit.setEndtime(instance.getTime()); - //截止收租日在当前时间之前 - if (wxBillDeposit.getReceiveDate().before(date)) { - long day = (time.getTime() - date.getTime()) / (24 * 60 * 60 * 1000); - wxBillDeposit.setStatus(EnumBillRentStatus.NOT_PAID.getCode()); - wxBillDeposit.setExpiredDay(day); - } else { - wxBillDeposit.setStatus(EnumBillRentStatus.WAIT_PAY.getCode()); - wxBillDeposit.setExpiredDay(0L); - } - + wxBillDeposit.setStatus(EnumBillRentStatus.WAIT_PAY.getCode()); + wxBillDeposit.setExpiredDay(0L); wxBillDeposit.setTenantId(wxMerchant.getTenantId()); wxBillDeposit.setIsDel(0); wxBillDeposit.setMerchantId(wxMerchant.getId()); 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 4b74938d2..46cdc8c24 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -417,19 +417,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { instance.setTime(wxBillDeposit.getReceiveDate()); instance.add(dayType, wxRentContract.getLease()); wxBillDeposit.setEndtime(instance.getTime()); - - //截止收租日在当前时间之前 - if (wxBillDeposit.getReceiveDate().before(date)) { - long day = (time.getTime() - date.getTime()) / (24 * 60 * 60 * 1000); - wxBillDeposit.setStatus(EnumBillRentStatus.NOT_PAID.getCode()); - wxBillDeposit.setExpiredDay(day); - wxBillDeposit.setReceiveDate(time); - } else { - wxBillDeposit.setStatus(EnumBillRentStatus.WAIT_PAY.getCode()); - wxBillDeposit.setExpiredDay(0L); - wxBillDeposit.setReceiveDate(time); - } - + wxBillDeposit.setStatus(EnumBillRentStatus.WAIT_PAY.getCode()); + wxBillDeposit.setExpiredDay(0L); + wxBillDeposit.setReceiveDate(time); wxBillDeposit.setTenantId(wxMerchant.getTenantId()); wxBillDeposit.setIsDel(0); wxBillDeposit.setMerchantId(wxMerchant.getId());