From 5c2027ebee9cc1a7283b73d296f37d7e82de337e Mon Sep 17 00:00:00 2001 From: winter Date: Fri, 13 Jan 2023 14:33:04 +0800 Subject: [PATCH] fix bug --- .../iformall/schedule/ContractSchedule.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/ContractSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/ContractSchedule.java index 144810580..3b92d6833 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/ContractSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/ContractSchedule.java @@ -152,11 +152,11 @@ public class ContractSchedule { //物业合同 List contractList = wxRentContractService.findToOutDateContracts(wxMall); for (WxRentContract rent:contractList) { - Date endDate = DateUtils.stringToDate(DateUtils.getTimeBefore(rent.getOutDateNotifyDays(),rent.getRentalEndDate()), DateUtils.DATE_TIME_PATTERN); - if (endDate.after(date)) { - continue; - } try { + Date endDate = DateUtils.stringToDate(DateUtils.getTimeBefore(rent.getOutDateNotifyDays(),rent.getRentalEndDate(),DateUtils.DATE_TIME_PATTERN), DateUtils.DATE_TIME_PATTERN); + if (endDate.after(date)) { + continue; + } WxMsgRecord msgRecord = new WxMsgRecord(); msgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); msgRecord.updateTenantInfo(wxMall); @@ -165,7 +165,7 @@ public class ContractSchedule { Map dynamicContentMap = new HashMap(); dynamicContentMap.put("id", String.valueOf(rent.getId())); dynamicContentMap.put("contractType", "租金"); - dynamicContentMap.put("contract", String.valueOf(rent.getId())); + dynamicContentMap.put("contract", rent.getContractNumber()); msgRecord.setDynamicContentMap(dynamicContentMap); mqBaseProducer.sendMessage(msgRecord, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); }catch(Exception e) { @@ -187,11 +187,11 @@ public class ContractSchedule { //物业合同 List contractList = wxPropertyContractService.findToOutDateContracts(wxMall); for (WxPropertyContract rent:contractList) { - Date endDate = DateUtils.stringToDate(DateUtils.getTimeBefore(rent.getOutDateNotifyDays(),rent.getRentalEndDate()), DateUtils.DATE_TIME_PATTERN); - if (endDate.after(date)) { - continue; - } try { + Date endDate = DateUtils.stringToDate(DateUtils.getTimeBefore(rent.getOutDateNotifyDays(),rent.getRentalEndDate(),DateUtils.DATE_TIME_PATTERN), DateUtils.DATE_TIME_PATTERN); + if (endDate.after(date)) { + continue; + } WxMsgRecord msgRecord = new WxMsgRecord(); msgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); msgRecord.updateTenantInfo(wxMall); @@ -200,7 +200,7 @@ public class ContractSchedule { Map dynamicContentMap = new HashMap(); dynamicContentMap.put("id", String.valueOf(rent.getId())); dynamicContentMap.put("contractType", "物业"); - dynamicContentMap.put("contract", String.valueOf(rent.getId())); + dynamicContentMap.put("contract", rent.getContractNumber()); msgRecord.setDynamicContentMap(dynamicContentMap); mqBaseProducer.sendMessage(msgRecord, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); }catch(Exception e) {