From 8e3ce2632fb20f25e6ba81a28a9f2c22f61224d8 Mon Sep 17 00:00:00 2001 From: luozukai Date: Fri, 22 Feb 2019 17:48:20 +0800 Subject: [PATCH] =?UTF-8?q?[=E9=93=9C=E9=94=A3=E6=B9=BE][=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0][=E9=A2=84=E8=B4=A6=E5=8D=95]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/WxRentContractServiceImpl.java | 38 ++++++++++++++++--- 1 file changed, 32 insertions(+), 6 deletions(-) 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 8f531a8b6..0c2db6484 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -249,12 +249,38 @@ public class WxRentContractServiceImpl implements WxRentContractService { if(record.getReceivePeriod() != null && record.getLease()!=null && record.getPrice()!= null){ //对比上一次,是否有更改,有,重新生成预账单 WxRentContract dbRent = wxRentContractMapper.selectByPrimaryKey(record.getId()); - if(!record.getReceivePeriod().equals(dbRent.getReceivePeriod()) - ||!record.getLease().equals(dbRent.getLease()) - ||!record.getType().equals(dbRent.getType()) - ||!record.getPrice().equals(dbRent.getPrice()) - ||!record.getAdjustRatio().equals(dbRent.getAdjustRatio()) - ) { + boolean change = false; + + if(record.getType().equals(EnumRentContractType.RENT_BY_AREA.getCode())){ + if(!record.getReceivePeriod().equals(dbRent.getReceivePeriod()) + ||!record.getLease().equals(dbRent.getLease()) + ||!record.getType().equals(dbRent.getType()) + ||!record.getPrice().equals(dbRent.getPrice()) + ||!record.getAdjustRatio().equals(dbRent.getAdjustRatio()) + ) { + change = true; + } + }else if(record.getType().equals(EnumRentContractType.RENT_BY_JOINT.getCode())){ + if(!record.getReceivePeriod().equals(dbRent.getReceivePeriod()) + ||!record.getLease().equals(dbRent.getLease()) + ||!record.getType().equals(dbRent.getType()) + ||!record.getRevenue().equals(dbRent.getRevenue()) + ||!record.getPayRatio().equals(dbRent.getPayRatio()) + ) { + change = true; + } + }else if(record.getType().equals(EnumRentContractType.RENT_BY_AREA_AND_JOINT.getCode())){ + if(!record.getReceivePeriod().equals(dbRent.getReceivePeriod()) + ||!record.getLease().equals(dbRent.getLease()) + ||!record.getType().equals(dbRent.getType()) + ||!record.getPrice().equals(dbRent.getPrice()) + ||!record.getPayRatio().equals(dbRent.getPayRatio()) + ) { + change = true; + } + } + + if(change) { wxBillRentMapper.deletePreviewBill(record); //重新生成 resultList = buildRent(new WxMerchant(), null, record, EnumIsPreview.YES.getCode());