From bfe530795f4e9180bc3a242d2d0a1d717e9dadd4 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 25 Apr 2019 20:45:36 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=90=88=E5=90=8C][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=94=9F=E6=88=90=E9=A2=84=E8=B4=A6=E5=8D=95?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/WxPropertyContractServiceImpl.java | 17 ++++++++++------- .../service/impl/WxRentContractServiceImpl.java | 10 ++++++++-- 2 files changed, 18 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 3747f59a5..a293f7f16 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -290,13 +290,16 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService record.setPreviewBillRentList(billList); //生成预览账单 - if(CollectionUtils.isEmpty(billList) || - (!wxPropertyContract.getReceivePeriod().equals(record.getReceivePeriod()) - ||!wxPropertyContract.getPrice().equals(record.getPrice()) - ||!wxPropertyContract.getDeposit().equals(record.getDeposit()) - ||!wxPropertyContract.getAdjustPeriod().equals(record.getAdjustPeriod()) - || !DateUtils.date2String(wxPropertyContract.getRentalStartDate(),"yyyy-MM-dd").equals(DateUtils.date2String(record.getRentalStartDate(),"yyyy-MM-dd")) - )){ +// if(CollectionUtils.isEmpty(billList) || +// (!wxPropertyContract.getReceivePeriod().equals(record.getReceivePeriod()) +// ||!wxPropertyContract.getPrice().equals(record.getPrice()) +// ||!wxPropertyContract.getDeposit().equals(record.getDeposit()) +// ||!wxPropertyContract.getAdjustPeriod().equals(record.getAdjustPeriod()) +// || !DateUtils.date2String(wxPropertyContract.getRentalStartDate(),"yyyy-MM-dd").equals(DateUtils.date2String(record.getRentalStartDate(),"yyyy-MM-dd")) +// )){ + if (record.getReceivePeriod() != null && record.getLease() != null && record.getPrice() != null + && !record.getReceivePeriod().equals(0) && !record.getLease().equals(0) && !record.getPrice().equals(0)) { + //删除预账单,重新生成 wxBillPropertyMapper.deletePreviewBill(record); //重新生成 wxPropertyContract.setPrice(record.getPrice()); 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 ef286d712..0ec077190 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -344,7 +344,13 @@ public class WxRentContractServiceImpl implements WxRentContractService { return resultData; } - //有改变,删除预账单,重新生成 + if (record.getReceivePeriod() != null && record.getLease() != null && record.getPrice() != null + && !record.getReceivePeriod().equals(0) && !record.getLease().equals(0) && !record.getPrice().equals(0)) { + //删除预账单,重新生成 + wxBillRentMapper.deletePreviewBill(record); + resultList = buildRent(new WxMerchant(), null, record, EnumIsPreview.YES.getCode()); + } + /* //有改变,删除预账单,重新生成 if (record.getReceivePeriod() != null && record.getLease() != null && record.getPrice() != null && !record.getReceivePeriod().equals(0) && !record.getLease().equals(0) && !record.getPrice().equals(0)) { boolean change = false; @@ -389,7 +395,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { wxBillRentMapper.deletePreviewBill(record); resultList = buildRent(new WxMerchant(), null, record, EnumIsPreview.YES.getCode()); } - } + }*/ //启动审批流 if(record.getFlowParams() != null){