| @@ -152,11 +152,11 @@ public class ContractSchedule { | |||||
| //物业合同 | //物业合同 | ||||
| List<WxRentContract> contractList = wxRentContractService.findToOutDateContracts(wxMall); | List<WxRentContract> contractList = wxRentContractService.findToOutDateContracts(wxMall); | ||||
| for (WxRentContract rent:contractList) { | for (WxRentContract rent:contractList) { | ||||
| Date endDate = DateUtils.stringToDate(DateUtils.getTimeBefore(rent.getOutDateNotifyDays(),rent.getRentalEndDate()), DateUtils.DATE_TIME_PATTERN); | |||||
| if (endDate.after(date)) { | |||||
| continue; | |||||
| } | |||||
| try { | 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(); | WxMsgRecord msgRecord = new WxMsgRecord(); | ||||
| msgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); | msgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); | ||||
| msgRecord.updateTenantInfo(wxMall); | msgRecord.updateTenantInfo(wxMall); | ||||
| @@ -165,7 +165,7 @@ public class ContractSchedule { | |||||
| Map<String,String> dynamicContentMap = new HashMap<String,String>(); | Map<String,String> dynamicContentMap = new HashMap<String,String>(); | ||||
| dynamicContentMap.put("id", String.valueOf(rent.getId())); | dynamicContentMap.put("id", String.valueOf(rent.getId())); | ||||
| dynamicContentMap.put("contractType", "租金"); | dynamicContentMap.put("contractType", "租金"); | ||||
| dynamicContentMap.put("contract", String.valueOf(rent.getId())); | |||||
| dynamicContentMap.put("contract", rent.getContractNumber()); | |||||
| msgRecord.setDynamicContentMap(dynamicContentMap); | msgRecord.setDynamicContentMap(dynamicContentMap); | ||||
| mqBaseProducer.sendMessage(msgRecord, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); | mqBaseProducer.sendMessage(msgRecord, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); | ||||
| }catch(Exception e) { | }catch(Exception e) { | ||||
| @@ -187,11 +187,11 @@ public class ContractSchedule { | |||||
| //物业合同 | //物业合同 | ||||
| List<WxPropertyContract> contractList = wxPropertyContractService.findToOutDateContracts(wxMall); | List<WxPropertyContract> contractList = wxPropertyContractService.findToOutDateContracts(wxMall); | ||||
| for (WxPropertyContract rent:contractList) { | for (WxPropertyContract rent:contractList) { | ||||
| Date endDate = DateUtils.stringToDate(DateUtils.getTimeBefore(rent.getOutDateNotifyDays(),rent.getRentalEndDate()), DateUtils.DATE_TIME_PATTERN); | |||||
| if (endDate.after(date)) { | |||||
| continue; | |||||
| } | |||||
| try { | 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(); | WxMsgRecord msgRecord = new WxMsgRecord(); | ||||
| msgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); | msgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); | ||||
| msgRecord.updateTenantInfo(wxMall); | msgRecord.updateTenantInfo(wxMall); | ||||
| @@ -200,7 +200,7 @@ public class ContractSchedule { | |||||
| Map<String,String> dynamicContentMap = new HashMap<String,String>(); | Map<String,String> dynamicContentMap = new HashMap<String,String>(); | ||||
| dynamicContentMap.put("id", String.valueOf(rent.getId())); | dynamicContentMap.put("id", String.valueOf(rent.getId())); | ||||
| dynamicContentMap.put("contractType", "物业"); | dynamicContentMap.put("contractType", "物业"); | ||||
| dynamicContentMap.put("contract", String.valueOf(rent.getId())); | |||||
| dynamicContentMap.put("contract", rent.getContractNumber()); | |||||
| msgRecord.setDynamicContentMap(dynamicContentMap); | msgRecord.setDynamicContentMap(dynamicContentMap); | ||||
| mqBaseProducer.sendMessage(msgRecord, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); | mqBaseProducer.sendMessage(msgRecord, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); | ||||
| }catch(Exception e) { | }catch(Exception e) { | ||||