From 49622eb255ea7f29daed3241baf62873ba7d362a Mon Sep 17 00:00:00 2001
From: zhaozhengjie <237651143@qq.com>
Date: 星期五, 09 九月 2022 12:16:55 +0800
Subject: [PATCH] Merge branch 'huacheng_push' into haucheng_panzhihua

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java |   37 +++++++++++++++++++++++++++++++++++--
 1 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
index f0fc51b..e42da4f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
@@ -823,9 +823,42 @@
         log.info("定时任务--报名结束修改社区活动进行状态活动数量【{}】", num3);
         // 查询已经结束的活动,需要计算积分
         List<Long> activityEndIds = comActActivityDAO.getActivityEndIds();
+        if(!CollectionUtils.isEmpty(activityEndIds)){
+            activityEndIds.forEach(activityId->{
+                List<String> openIds=comActActivityDAO.selectOpenIdByActivityId(activityId);
+                if(!CollectionUtils.isEmpty(openIds)){
+                    openIds.forEach(op->{
+                        WxXCXTempSend wxXCXTempSend=new WxXCXTempSend();
+                        try {
+                            WxUtil.sendLongTimeTemplate(op,wxXCXTempSend.getAccessToken(),"活动开始提醒","您参加的活动已开始","packageC/pages/activity/communityActivityDetails/communityActivityDetails?id="+activityId);
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+                    });
+                }
+            });
+        }
         // 修改进行状态 变为进行中或者已结束
-        int num2 = comActActivityDAO.updateStatusToBeginActiveOrEnd();
-        log.info("定时任务--修改社区活动进行状态活动数量【{}】", num2);
+        List<Long> ids = comActActivityDAO.getActivityEndIds();
+        if(!CollectionUtils.isEmpty(ids)){
+            int num2 = comActActivityDAO.updateStatusToBeginActiveOrEnd();
+            log.info("定时任务--修改社区活动进行状态活动数量【{}】", num2);
+            ids.forEach(id ->{
+                List<String> openIds=comActActivityDAO.selectOpenIdByActivityId(id);
+                if(!CollectionUtils.isEmpty(openIds)){
+                    openIds.forEach(op->{
+                        WxXCXTempSend wxXCXTempSend=new WxXCXTempSend();
+                        try {
+                            WxUtil.sendLongTimeTemplate(op,wxXCXTempSend.getAccessToken(),"活动结束提醒","您参加的活动已结束","packageC/pages/activity/communityActivityDetails/communityActivityDetails?id="+id);
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+                    });
+                }
+            });
+        }
+
+
         return R.ok(activityEndIds);
     }
 

--
Gitblit v1.7.1