Prechádzať zdrojové kódy

Merge remote-tracking branch 'origin/master'

peiguo 5 rokov pred
rodič
commit
5c6020cfaf

+ 21 - 1
whepi-web/src/main/java/com/bofeng/service/EpiTemplateMessageService.java

@@ -75,7 +75,27 @@ public class EpiTemplateMessageService {
             map.put("keyword3", str1);
             map.put("keyword4", "无");
             map.put("keyword5", "系统");
-            map.put("remark", "    家园互助平台提醒您,请及时提交今天的健康日报。");
+            map.put("remark", "家园互助平台提醒您,为了您和他人的健康请及时提交每天的健康日报,上报情况将直接关系到您的小区临时出入");
+            re = 1;
+        }
+        templateMessageService.sendSysRemindMessage(openId, "", map);
+        return re;
+    }
+
+    public int tuangouSendRemindMessage(Long userId, String openId, Date endDate) {
+        int re = 0;
+        Map<String, String> map = Maps.newHashMap();
+        List<UptownHome> uptownHomeList = uptownHomeMapper.getUptownHomeByUserId(userId);
+        if (uptownHomeList != null && uptownHomeList.size()>0) {
+            map.put("first", "尊敬的 "+uptownHomeList.get(0).getLinkman()+" 先生/女士,");
+            map.put("keyword1", "家园互助平台");
+            map.put("keyword2", "团购上报");
+            SimpleDateFormat sdf1 =new SimpleDateFormat("yyyy-MM-dd" );
+            String str1 = sdf1.format(endDate);
+            map.put("keyword3", str1);
+            map.put("keyword4", "无");
+            map.put("keyword5", "系统");
+            map.put("remark", "亲爱的居民,有新的团购正在组织进行请及时关注,如有需要进入应用在截止时前上报您的物资需求,谢谢配合");
             re = 1;
         }
         templateMessageService.sendSysRemindMessage(openId, "", map);