Merge branch 'feature-canvas' into 'developer'

Feature canvas

See merge request !2356

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

@@ -35,7 +35,7 @@ public enum NoticeMessageTypeEnum {
     CLERK_TASK_SEND_NOTICE(2014, "导购任务通知", NoticeMessageCategoryTypeEnum.TASK.getType(), "clerk_task_send_notice", "/pages/route/index?pageType=", "hbapp_guide_task_detail", "clerk_task_send_notice", "haobanNotice"),
 
 
-    GROUP_CHAT_PLAN(2015, "社群群发任务通知", NoticeMessageCategoryTypeEnum.TASK.getType(), "haobanGroupChatPlan", "/pages/route/index?pageType=", "hbapp_guide_task_detail", "haobanGroupChatPlan", "haobanNotice"),
+    GROUP_CHAT_PLAN(2015, "社群群发任务通知", NoticeMessageCategoryTypeEnum.TASK.getType(), "haobanGroupChatPlan", "/pages/route/index?pageType=", "hbapp_canvas_group_send", "haobanGroupChatPlan", "haobanNotice"),
 
 
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/chat/impl/GroupChatPlanServiceImpl.java

@@ -306,13 +306,14 @@ public class GroupChatPlanServiceImpl implements GroupChatPlanService {
         return Collections.emptyList() ;
     }
 
-    private void sendNotice(String enterpriseId, String staffId ,String clerkId , String taskName , Date endTime) {
+    private void sendNotice(String enterpriseId, String staffId ,String clerkId , String taskName , Date endTime,Long ownerLogId) {
         logger.info("发送社群任务通知,clerkId={}",clerkId);
         //  发送通知
         Map<String, String> map = new HashMap<>();
         map.put("taskName", taskName);
         map.put("overTime", DateUtil.dateToStr(endTime,"yyyy-MM-dd HH:mm:ss"));
         JSONObject jsonObject = new JSONObject();
+        jsonObject.put("taskId",ownerLogId) ;
         int messageType = NoticeMessageTypeEnum.GROUP_CHAT_PLAN.getType();
         NoticeMessageUtil.sendNoticeMessageByStaff(enterpriseId,staffId,clerkId,messageType,null,map,jsonObject);
     }
@@ -424,7 +425,7 @@ public class GroupChatPlanServiceImpl implements GroupChatPlanService {
                        String enterpriseId = ownerLog.getEnterpriseId() ;
                        String clerkId = ownerLog.getClerkId() ;
                        String staffId = ownerLog.getStaffId() ;
-                       this.sendNotice(enterpriseId,staffId,clerkId,plan.getName(),plan.getEndTime());
+                       this.sendNotice(enterpriseId,staffId,clerkId,plan.getName(),plan.getEndTime(),ownerLog.getOwnerLogId());
                    }
                 }
             }

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

 package com.gic.haoban.manage.service.service.impl;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import com.gic.enterprise.api.dto.EnterpriseWxaRelationDTO;
@@ -254,13 +255,12 @@ public class QywxSendServiceImpl implements QywxSendService {
             if(materialType==7) {
                 String str = "{\"id\":48,\"url\":\"/pages/member-center/coupon/coupon-group-get/coupon-group-get?execLogId="+execLogId+"&canvasId="+canvasId+"&time="+clerkTaskTime+"&nodeId="+nodeId+"\"}" ;
                 EnterpriseWxaRelationDTO en = this.enterpriseService.getByWxappkey(material.getAppId()) ;
-                Map<String, Object> map = this.enterpriseWxaLinkService.getWxaLinkAndQrCodeWithChannelAndSceneOfNotUrl(en.getEnterpriseId(),str,canvasId+"","canvas",nodeId+"_"+execLogId+"_"+clerkTaskTime+"_"+clerkId) ;
-                path = map.get("link").toString() ;
+                //Map<String, Object> map = this.enterpriseWxaLinkService.getWxaLinkAndQrCodeWithChannelAndSceneOfNotUrl(en.getEnterpriseId(),str,canvasId+"","canvas",nodeId+"_"+execLogId+"_"+clerkTaskTime+"_"+clerkId) ;
+                path = this.enterpriseWxaLinkService.getLinkForCanvas(en.getEnterpriseId(),str,canvasId,nodeId,execLogId,new Date(clerkTaskTime),clerkId) ;
             }
             if(StringUtils.isNotBlank(material.getLink()) && material.getLink().startsWith("{")) {
                 EnterpriseWxaRelationDTO en = this.enterpriseService.getByWxappkey(material.getAppId()) ;
-                Map<String, Object> map = this.enterpriseWxaLinkService.getWxaLinkAndQrCodeWithChannelAndSceneOfNotUrl(en.getEnterpriseId(),material.getLink(),canvasId+"","canvas",nodeId+"_"+execLogId+"_"+clerkTaskTime+"_"+clerkId) ;
-                path = map.get("link").toString() ;
+                path = this.enterpriseWxaLinkService.getLinkForCanvas(en.getEnterpriseId(),material.getLink(),canvasId,nodeId,execLogId,new Date(clerkTaskTime),clerkId) ;
             }
             if(null != planType && StringUtils.isNotBlank(planId)) {
                 String url = "qtActivityType="+planType+"&qtActivityId="+planId ;

haoban-manage3-service/src/test/java/QwOpenTest.java

@@ -24,18 +24,9 @@ public class QwOpenTest {
 
     @Test
     public void tt()  {
-      /*  OpenStaffInitQDTO s = new OpenStaffInitQDTO() ;
-        s.setStaffId("52995ea8c81c4cc286a9b82bc36a7081");
-        s.setWxEnterpriseId("ca66a01b79474c40b3e7c7f93daf1a3b");
-        s.setEnterpriseId("ff8080815dacd3a2015dacd3ef5c0000");
-        this.openStaffApiService.init(s) ;*/
 
-        List<String> list = this.list();
-        for(String m : list) {
-           // memberApiService.updateMemberQywxEveryOccasion("ff8080816f6be950016f82d9c2061b92", "0000000090dacb280190deec34d0531b", 0, new Date(), null);
-        }
 
-        memberApiService.updateMemberQywxEveryOccasion("ff8080816f6be950016f82d9c2061b92", "0000000090dacb280190deec34d0531b", 0, new Date(), null);
+        memberApiService.updateMemberQywxEveryOccasion("ff8080816d6905a5016d6b79a017014a", "61dd1e382a1f42ea9256c7e9c819dc34", 1, new Date(1705232487000L), new Date(1705232487000L));
 
 
     }