From 57554a45732be697bae5af416d4f7fd8495b475f Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 11 Jul 2019 20:37:10 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=90=88=E5=90=8C][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E7=94=9F=E6=88=90=E9=A2=84=E8=B4=A6=E5=8D=95=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E4=B8=BA0=E8=AE=BE=E7=BD=AE=E4=BB=98=E6=AC=BE=E6=97=B6?= =?UTF-8?q?=E9=97=B4]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxPropertyContractServiceImpl.java | 8 ++++---- .../iformall/service/impl/WxRentContractServiceImpl.java | 9 ++++----- 2 files changed, 8 insertions(+), 9 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 fe070bdd6..dfb5ecf37 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -225,10 +225,6 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService bill.setPropertyContractId(record.getId()); bill.setCreatetime(date); bill.setTenantId(record.getTenantId()); - if (bill.getReceivePay().equals(0L)) { - bill.setStatus(EnumBillRentStatus.PAID.getCode()); - bill.setPayDate(date); - } bill.setOwe(bill.getReceivePay()); bill.setNeedPay(bill.getNeedPay()); bill.setUpdatetime(date); @@ -242,6 +238,10 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService bill.setIsDel(EnumDelStatus.NOT_DEL.getCode()); bill.setShopId(record.getShopId()); setExpiredDay(bill,Calendar.MONTH,record.getReceivePeriod()); + if (bill.getReceivePay().equals(0L)) { + bill.setStatus(EnumBillRentStatus.PAID.getCode()); + bill.setPayDate(date); + } count++; } wxBillPropertyMapper.insertBills(record.getPreviewBillRentList()); 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 ae15cfba4..4ecf1d617 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -459,10 +459,6 @@ public class WxRentContractServiceImpl implements WxRentContractService { bill.setRentContractId(record.getId()); bill.setCreatetime(date); bill.setTenantId(record.getTenantId()); - if (bill.getReceivePay().equals(0L)) { - bill.setStatus(EnumBillRentStatus.PAID.getCode()); - bill.setPayDate(date); - } bill.setOwe(bill.getReceivePay()); bill.setNeedPay(bill.getNeedPay()); bill.setUpdatetime(date); @@ -475,8 +471,11 @@ public class WxRentContractServiceImpl implements WxRentContractService { bill.setPay(0L); bill.setIsDel(EnumDelStatus.NOT_DEL.getCode()); bill.setShopId(record.getShopId()); - bill.setShopInfo(record.getRentInfo()); setExpiredDay(bill,Calendar.MONTH,record.getReceivePeriod()); + if (bill.getReceivePay().equals(0L)) { + bill.setStatus(EnumBillRentStatus.PAID.getCode()); + bill.setPayDate(date); + } count++; } wxBillRentMapper.insertBills(record.getPreviewBillRentList());