From 4526d492c7ee42d0117fa7949f531ba39fd508ab Mon Sep 17 00:00:00 2001 From: gongbiao Date: Sat, 27 Apr 2019 13:42:15 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=A7=9F=E8=B5=81=E5=90=88=E5=90=8C][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E7=94=9F=E6=88=90=E8=B4=A6=E5=8D=95?= =?UTF-8?q?=E9=9D=9E=E6=AC=A0=E7=BC=B4=E7=8A=B6=E6=80=81=E6=AC=A0=E7=BC=B4?= =?UTF-8?q?=E9=87=91=E9=A2=9D=E9=BB=98=E8=AE=A40]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/service/impl/WxPropertyContractServiceImpl.java | 5 +++-- .../com/iformall/service/impl/WxRentContractServiceImpl.java | 3 ++- 2 files changed, 5 insertions(+), 3 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 53f483357..2e128c251 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -674,7 +674,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService } wxBillProperty.setNeedPay(needpay); - wxBillProperty.setOwe(needpay); + wxBillProperty.setOwe(0L); wxBillProperty.setReceivePay(needpay); //截止收租日在当前时间之前 @@ -682,6 +682,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService long day = (time.getTime() - date.getTime()) / (24 * 60 * 60 * 1000); wxBillProperty.setStatus(EnumBillRentStatus.NOT_PAID.getCode()); wxBillProperty.setExpiredDay(day); + wxBillProperty.setOwe(needpay); } else {//截止收租日在当前时间之后 Calendar now = Calendar.getInstance(); now.add(dayType, receivePeriod); @@ -695,7 +696,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService wxBillProperty.setExpiredDay(0L); } } - + wxBillProperty.setRevenue(0L); wxBillProperty.setTenantId(wxMerchant.getTenantId()); wxBillProperty.setIsDel(0); wxBillProperty.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 b6aa38928..45b29a9cd 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -1065,7 +1065,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { } wxBillRent.setNeedPay(needpay); - wxBillRent.setOwe(needpay); + wxBillRent.setOwe(0L); wxBillRent.setReceivePay(needpay); //截止收租日在当前时间之前 @@ -1073,6 +1073,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { long day = (time.getTime() - date.getTime()) / (24 * 60 * 60 * 1000); wxBillRent.setStatus(EnumBillRentStatus.NOT_PAID.getCode()); wxBillRent.setExpiredDay(day); + wxBillRent.setOwe(needpay); } else {//截止收租日在当前时间之后 Calendar now = Calendar.getInstance(); now.add(dayType, receivePeriod);