朋友圈

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/NoticeMessageTypeEnum.java

@@ -40,8 +40,8 @@ public enum NoticeMessageTypeEnum {
     TEL_TASK_CANVAS(2017, "话务任务通知", NoticeMessageCategoryTypeEnum.TASK.getType(), "haobanTelTaskCanvas", "/pages/route/index?pageType=", "hbapp_canvas_task", "haobanTelTaskCanvas", "haobanNotice"),
     HB_TASK_TO_DO_LIST_NOTICE(2018, "任务执行提醒", NoticeMessageCategoryTypeEnum.TASK.getType(), "haobanTaskTodoNotice", "/pages/route/index?pageType=", "", "haobanTaskTodoNotice", "haobanNotice"),
 
-    hbapp_canvas_friend_circle_task(2019, "朋友圈活动-任务详情", NoticeMessageCategoryTypeEnum.TASK.getType(), "haobanTaskTodoNotice", "/pages/route/index?pageType=", "hbapp_canvas_friend_circle_task", "haobanTaskTodoNotice", "haobanNotice"),
-    hbapp_canvas_friend_circle_list(2020, "朋友圈-活动列表", NoticeMessageCategoryTypeEnum.TASK.getType(), "haobanTelTaskCanvas", "/pages/route/index?pageType=", "hbapp_canvas_friend_circle_list", "haobanTelTaskCanvas", "haobanNotice"),
+    hbapp_canvas_friend_circle_task(2019, "朋友圈活动-任务详情", NoticeMessageCategoryTypeEnum.TASK.getType(), "qwMomentPlanDetail", "/pages/route/index?pageType=", "hbapp_canvas_friend_circle_task", "qwMomentPlanDetail", "haobanNotice"),
+    hbapp_canvas_friend_circle_list(2020, "朋友圈-活动列表", NoticeMessageCategoryTypeEnum.TASK.getType(), "qwMomentPlanList", "/pages/route/index?pageType=", "hbapp_canvas_friend_circle_list", "qwMomentPlanList", "haobanNotice"),
 
     STORE_ACCOUNT(3001, "账号申请", NoticeMessageCategoryTypeEnum.OTHER.getType(), "store_account", "/pages/route/index?pageType=", "store_relate_store_record_list", "accountApplication", "haobanNotice"),
     //

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/moment/impl/QwMomentPlanServiceImpl.java

@@ -187,9 +187,15 @@ public class QwMomentPlanServiceImpl implements QwMomentPlanService {
         return ServiceResponse.success(dto);
     }
 
-    private void sendTaskToClerk(String enterpriseId,String clerkId ,  Long planId) {
+    private void sendTaskToClerk(String clerkId, TabQwMomentPlan plan) {
+        String enterpriseId = plan.getEnterpriseId() ;
+        Long planId = plan.getPlanId() ;
+        String planName = plan.getTitle() ;
+        String invalidTime = DateUtil.dateToStr(plan.getEndDate(),"yyyy-MM-dd HH:mm:ss") ;
         logger.info("发送任务通知,clerkId={}",clerkId);
         Map<String, String> map = new HashMap<>();
+        map.put("taskName",planName) ;
+        map.put("invalidTime",invalidTime) ;
         int messageType =  NoticeMessageTypeEnum.hbapp_canvas_friend_circle_task.getType();
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("planId",planId) ;
@@ -330,7 +336,7 @@ public class QwMomentPlanServiceImpl implements QwMomentPlanService {
                 List<QwMomentPlanAttendDTO> list = this.qwMomentPlanAttendMapper.listClerk(planId);
                 if (CollectionUtils.isNotEmpty(list)) {
                     for (QwMomentPlanAttendDTO dto : list) {
-                        this.sendTaskToClerk(plan.getEnterpriseId(), dto.getClerkId(), plan.getPlanId());
+                        this.sendTaskToClerk(dto.getClerkId(),plan);
                     }
                 }
             }else {