| @@ -326,62 +326,63 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||
| if (resultData.code != Result.SUCCESS) { | |||
| return resultData; | |||
| } | |||
| if (dbRent.getRentShopType().equals(EnumRentShopType.SHOP.getCode())) { | |||
| if (record.getReceivePeriod() != null && record.getLease() != null && record.getPrice() != null | |||
| && !record.getReceivePeriod().equals(0) && !record.getLease().equals(0) && !record.getPrice().equals(0)) { | |||
| if (record.getReceivePeriod() != null && record.getLease() != null && record.getPrice() != null | |||
| && !record.getReceivePeriod().equals(0) && !record.getLease().equals(0) && !record.getPrice().equals(0)) { | |||
| if (dbRent.getRentShopType().equals(EnumRentShopType.SHOP.getCode())) { | |||
| //删除预账单,重新生成 | |||
| wxBillRentMapper.deletePreviewBill(record); | |||
| resultList = buildRent(new WxMerchant(), null, record, EnumIsPreview.YES.getCode()); | |||
| } | |||
| }else{ | |||
| boolean change = false; | |||
| if (CollectionUtils.isEmpty(resultList)) { | |||
| change = true; | |||
| } else if (record.getAdjustPeriod().intValue() != dbRent.getAdjustPeriod().intValue()) { | |||
| change = true; | |||
| } else { | |||
| if (record.getReceivePeriod() != null && record.getLease() != null && record.getPrice() != null) { | |||
| 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().replaceAll("\\s*", "").equals(dbRent.getAdjustRatio().replaceAll("\\s*", "")) | |||
| || !DateUtils.date2String(record.getRentalStartDate(),"yyyy-MM-dd").equals(DateUtils.date2String(dbRent.getRentalStartDate(),"yyyy-MM-dd")) | |||
| ) { | |||
| 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()) | |||
| || !DateUtils.date2String(record.getRentalStartDate(),"yyyy-MM-dd").equals(DateUtils.date2String(dbRent.getRentalStartDate(),"yyyy-MM-dd")) | |||
| ) { | |||
| 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()) | |||
| || !DateUtils.date2String(record.getRentalStartDate(),"yyyy-MM-dd").equals(DateUtils.date2String(dbRent.getRentalStartDate(),"yyyy-MM-dd")) | |||
| ) { | |||
| change = true; | |||
| boolean change = false; | |||
| if (CollectionUtils.isEmpty(resultList)) { | |||
| change = true; | |||
| } else if (record.getAdjustPeriod().intValue() != dbRent.getAdjustPeriod().intValue()) { | |||
| change = true; | |||
| } else { | |||
| if (record.getReceivePeriod() != null && record.getLease() != null && record.getPrice() != null) { | |||
| 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().replaceAll("\\s*", "").equals(dbRent.getAdjustRatio().replaceAll("\\s*", "")) | |||
| || !DateUtils.date2String(record.getRentalStartDate(), "yyyy-MM-dd").equals(DateUtils.date2String(dbRent.getRentalStartDate(), "yyyy-MM-dd")) | |||
| ) { | |||
| 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()) | |||
| || !DateUtils.date2String(record.getRentalStartDate(), "yyyy-MM-dd").equals(DateUtils.date2String(dbRent.getRentalStartDate(), "yyyy-MM-dd")) | |||
| ) { | |||
| 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()) | |||
| || !DateUtils.date2String(record.getRentalStartDate(), "yyyy-MM-dd").equals(DateUtils.date2String(dbRent.getRentalStartDate(), "yyyy-MM-dd")) | |||
| ) { | |||
| change = true; | |||
| } | |||
| } | |||
| } | |||
| } | |||
| } | |||
| //有改变,删除预账单,重新生成 | |||
| if (change) { | |||
| wxBillRentMapper.deletePreviewBill(record); | |||
| resultList = buildRent(new WxMerchant(), null, record, EnumIsPreview.YES.getCode()); | |||
| //有改变,删除预账单,重新生成 | |||
| if (change) { | |||
| wxBillRentMapper.deletePreviewBill(record); | |||
| resultList = buildRent(new WxMerchant(), null, record, EnumIsPreview.YES.getCode()); | |||
| } | |||
| } | |||
| } | |||
| //启动审批流 | |||
| if(record.getFlowParams() != null){ | |||
| record.getFlowParams().put("businessId",record.getId().toString()); | |||