Merge branch 'feature-canvas' into 'developer'

Feature canvas

See merge request !2426

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/CommonMQDTO.java

@@ -8,7 +8,7 @@ public class CommonMQDTO implements Serializable {
     * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么)
     */
     private static final long serialVersionUID = -5681421708810402425L;
-    // 1删除日报定时 2无部门成员修复 3 通知会员好友关系 4社群终止
+    // 1删除日报定时 2无部门成员修复 3 通知会员好友关系 4社群终止 5 刷新社群群发结果
     private int type;
     private Object params;
 

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

@@ -855,6 +855,12 @@ public class GroupChatPlanServiceImpl implements GroupChatPlanService {
             if(null != msgid) {
                 logger.info("获取msgid={},{}",ownerLogId,msgid);
                 this.groupChatPlanOwnerLogMapper.updateMsgid(ownerLogId,msgid);
+                CommonMQDTO mq = new CommonMQDTO() ;
+                mq.setType(5) ;
+                Map<String,String> map = new HashMap<>() ;
+                map.put("ownerLogId",ownerLogId+"") ;
+                mq.setParams(map);
+                this.haobanCommonMQApiService.putCommonDelayMessage(mq, 60);
             }
         }catch (Exception e) {
             logger.info("异常",e);

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

@@ -39,6 +39,7 @@ import com.gic.haoban.manage.service.service.StaffClerkRelationService;
 import com.gic.haoban.manage.service.service.WxEnterpriseService;
 import com.gic.haoban.manage.service.service.hm.WxUserAddLogService;
 import com.gic.haoban.manage.service.util.EventUtils;
+import com.gic.haoban.task.manage.api.service.IMarketTaskMemberApiService;
 import com.gic.member.api.dto.MemberDTO;
 import com.gic.member.api.dto.MemberSourceDetailDTO;
 import com.gic.member.api.dto.MemberSourceShowDTO;
@@ -106,6 +107,8 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
     private ExternalClerkRelatedService externalClerkRelatedService;
     @Autowired
     private StaffClerkRelationService staffClerkRelationService ;
+    @Autowired
+    private IMarketTaskMemberApiService iMarketTaskMemberApiService ;
 
     /**
      * 查询会员在企业下的好友关系
@@ -423,6 +426,7 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
        if(type==0) {
            log.info("删除会员,memberId：{}", memberId);
            this.tabHaobanExternalClerkRelatedMapper.updateStatusByMemberId(memberId, enterpriseId);
+           this.iMarketTaskMemberApiService.memberEvent(0,enterpriseId,memberId,null);
        }else if(type==1) {
            //合并会员,会员会先调删除,在调合并。顺序不能调换
            log.info("合并会员,memberId：{},新memberId={}", memberId , mergeMemberId);
@@ -432,6 +436,7 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
                log.info("会员合并 ,更新为企微好友,新memberId:{}", mergeMemberId);
                this.memberApiService.updateMemberQywxFlag(enterpriseId, mergeMemberId, 1);
                this.staffClerkRelationService.addMemberQywxFlag(enterpriseId,memberId);
+               this.iMarketTaskMemberApiService.memberEvent(1,enterpriseId,memberId,mergeMemberId);
            }
        }else if(type==2) {
            int m1 = this.tabHaobanExternalClerkRelatedMapper.countByMemberId(memberId, enterpriseId) ;

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

@@ -144,6 +144,10 @@ public class HaobanCommonMQApiServiceImpl implements HaobanCommonMQApiService {
             Long planId = Long.valueOf(map.get("planId")) ;
             this.groupChatPlanService.stopByMsgid(planId);
             break ;
+        case 5 :
+            Long ownerLogId = Long.valueOf(map.get("ownerLogId")) ;
+            this.groupChatPlanService.doPlanSendInfo(ownerLogId);
+            break;
         default:
             break;
         }

haoban-manage3-service/src/main/resources/dubbo-haoban-manage-service.xml

@@ -255,5 +255,5 @@
     <dubbo:reference id="enterpriseWxaLinkService" interface="com.gic.enterprise.api.service.EnterpriseWxaLinkService" timeout="30000" retries="0" check="false"/>
     <dubbo:reference id="qywxGroupSendCanvasApiService" interface="com.gic.haoban.task.manage.api.service.QywxGroupSendCanvasApiService" timeout="10000" retries="0" check="false"/>
     <dubbo:reference interface="com.gic.haoban.task.api.service.TelTaskApiService" id="telTaskApiService" timeout="10000" retries="0" check="false" />
-
+    <dubbo:reference interface="com.gic.haoban.task.manage.api.service.IMarketTaskMemberApiService" id="iMarketTaskMemberApiService"/>
 </beans>
\ No newline at end of file