Merge remote-tracking branch 'origin/master'

fs-qw-task/src/main/java/com/fs/app/controller/CommonController.java

@@ -172,7 +172,7 @@ public class CommonController {
 
     @GetMapping("/testSop3")
     public R testSop3(String date) throws Exception {
-        qwSopLogsService.createCorpMassSending(date);
+//        qwSopLogsService.createCorpMassSending(date);
 //        QwGetGroupmsgSendParam qwGetGroupmsgSendParam = new QwGetGroupmsgSendParam();
 //        qwGetGroupmsgSendParam.setMsgid("msg7tWFCgAAjJC-HqurNKsOJif5oUHQiA");
 //        qwGetGroupmsgSendParam.setUserid("ZhangZhanYue");

fs-qw-task/src/main/java/com/fs/app/task/qwTask.java

@@ -117,25 +117,48 @@ public class qwTask {
         sopLogsTaskChatService.createAiChatSopLogs(today);
     }
 
+//    /**
+//    * 定时 发送 通过调用 企业微信接口 发送的 SOP 群发消息
+//    */
+//    @Scheduled(cron = "0 15 0 * * ?")
+//    public void SendQwApiSopLogTimer(){
+//        log.info("zyp \n【企微官方接口群发开始】");
+////        qwSopLogsService.checkQwSopLogs();
+//        LocalDate localDate = LocalDateTime.now().withMinute(0).withSecond(0).withNano(0).toLocalDate();
+//        String date = localDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+//
+//        qwSopLogsService.createCorpMassSending(date);
+//    }
+//
+//    /**
+//    * 定时获取 通过调用 企业微信接口 发送的 SOP 客户群发消息 的反馈结果
+//    */
+//    @Scheduled(cron = "0 0 8 * * ?")
+//    public void GetQwApiSopLogResultTimer(){
+//        qwSopLogsService.qwSopLogsResult();
+//    }
+
     /**
-    * 定时 发送 通过调用 企业微信接口 发送的 SOP 群发消息
-    */
-    @Scheduled(cron = "0 15 0 * * ?")
-    public void SendQwApiSopLogTimer(){
+     * 定时 发送 通过调用 企业微信接口 发送的 SOP 群发消息(新版-安装营期发)
+     */
+    @Scheduled(cron = "0 20 0 * * ?")
+    public void SendQwApiSopLogTimerNew(){
+
         log.info("zyp \n【企微官方接口群发开始】");
 //        qwSopLogsService.checkQwSopLogs();
         LocalDate localDate = LocalDateTime.now().withMinute(0).withSecond(0).withNano(0).toLocalDate();
         String date = localDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
 
-        qwSopLogsService.createCorpMassSending(date);
+        qwSopLogsService.createCorpMassSendingByUserLogs(date);
     }
 
+
     /**
-    * 定时获取 通过调用 企业微信接口 发送的 SOP 客户群发消息 的反馈结果
-    */
+     * 定时获取 通过调用 企业微信接口 发送的 SOP 客户群发消息 的反馈结果(新版-安装营期发)
+     */
     @Scheduled(cron = "0 0 8 * * ?")
-    public void GetQwApiSopLogResultTimer(){
-        qwSopLogsService.qwSopLogsResult();
+    public void GetQwApiSopLogResultTimerNew(){
+        qwSopLogsService.qwSopLogsResultNew();
     }
 
     /**

fs-qwhook-sop/src/main/java/com/fs/app/redis/RedisKeyExpirationListener.java

@@ -41,9 +41,6 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
     @Autowired
     private ConfigUtil configUtil;
 
-    @Value("${hook.path}")
-    private String hookPath;
-
     @Autowired
     private StringRedisTemplate redisTemplate;  // 使用 RedisTemplate 进行分布式锁
 

fs-service/src/main/java/com/fs/course/mapper/FsCourseLinkMapper.java

@@ -22,6 +22,12 @@ public interface FsCourseLinkMapper
      */
     public FsCourseLink selectFsCourseLinkByLinkId(Long linkId);
 
+
+    @Select("select * from fs_course_link where qw_user_id = #{qwUserId} and video_id = #{videoId} and qw_external_id = #{qwExternalId} " +
+            "and link_type=5 order by create_time desc limit 1")
+    public FsCourseLink selectExpireLinkByQwExternalId(@Param("qwUserId") String qwUserId ,@Param("videoId") Long videoId,@Param("qwExternalId") Long  qwExternalId);
+
+
     /**
      * 查询短链列表
      *

fs-service/src/main/java/com/fs/course/mapper/FsCourseWatchLogMapper.java

@@ -313,4 +313,10 @@ public interface FsCourseWatchLogMapper extends BaseMapper<FsCourseWatchLog> {
 
     @Select("SELECT min(create_time) FROM fs_course_watch_log WHERE user_id=#{userId} limit 1")
     Date queryFirstWatchDateLogByVideoId(Long userId);
+
+    @Select("select  * from fs_course_watch_log where user_id=#{userId} " +
+            "and video_id=#{videoId} and qw_user_id=#{qwUserId} limit 1 " )
+    FsCourseWatchLog selectFsCourseWatchLogByCourseSopIdAndVideoId(@Param("userId") Long userId,
+                                                                   @Param("videoId") Long videoId,
+                                                                   @Param("qwUserId") String qwUserId);
 }

fs-service/src/main/java/com/fs/course/service/impl/FsUserCourseVideoServiceImpl.java

@@ -42,6 +42,7 @@ import com.fs.qwApi.param.QwAddContactWayParam;
 import com.fs.qwApi.service.QwApiService;
 import com.fs.sop.mapper.QwSopLogsMapper;
 import com.fs.sop.mapper.SopUserLogsInfoMapper;
+import com.fs.sop.service.ISopUserLogsInfoService;
 import com.fs.system.service.ISysConfigService;
 import com.github.binarywang.wxpay.bean.transfer.TransferBillsResult;
 import lombok.extern.slf4j.Slf4j;
@@ -86,6 +87,11 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
     private FsCourseQuestionBankMapper courseQuestionBankMapper;
     @Autowired
     private FsCourseWatchLogMapper courseWatchLogMapper;
+    @Autowired
+    private ISopUserLogsInfoService iSopUserLogsInfoService;
+    @Autowired
+    private FsCourseLinkMapper fsCourseLinkMapper;
+
 
     @Autowired
     private QwExternalContactMapper qwExternalContactMapper;
@@ -429,13 +435,31 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
             return R.error("链接过期");
         }
 
+        Long qwExternalId = param.getQwExternalId();
 
+        FsCourseWatchLog log=new FsCourseWatchLog();
 
-        FsCourseWatchLog log = courseWatchLogMapper.getWatchCourseVideoByExt(param.getQwExternalId(), param.getVideoId(),param.getQwUserId());
-        if (log==null ){
-            return addCustomerService(param.getQwUserId(),msg);
+        //如果是官方的则查真正的外部联系人id
+        if (param.getLinkType()!=null&&param.getLinkType()==5) {
+            log = courseWatchLogMapper.selectFsCourseWatchLogByCourseSopIdAndVideoId(param.getUserId(), param.getVideoId(), param.getQwUserId());
+            if (log == null) {
+                return addCustomerService(param.getQwUserId(), msg);
+            }else {
+                qwExternalId=log.getQwExternalContactId();
+            }
+
+        }else {
+            log = courseWatchLogMapper.getWatchCourseVideoByExt(qwExternalId, param.getVideoId(),param.getQwUserId());
+            if (log==null ){
+                return addCustomerService(param.getQwUserId(),msg);
+            }
         }
 
+//        FsCourseWatchLog log = courseWatchLogMapper.getWatchCourseVideoByExt(param.getQwExternalId(), param.getVideoId(),param.getQwUserId());
+//        if (log==null ){
+//            return addCustomerService(param.getQwUserId(),msg);
+//        }
+
         //查询是否有添加客服
         QwExternalContact externalContact = qwExternalContactMapper.selectQwExternalContactById(param.getQwExternalId());
 
@@ -465,6 +489,16 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
             }
             log.setUpdateTime(new Date());
             courseWatchLogMapper.updateFsCourseWatchLog(log);
+
+
+            iSopUserLogsInfoService.updateSopUserInfoByExternalId(qwExternalId,param.getUserId());
+
+
+            if (param.getLinkType()!=null&&param.getLinkType()==5){
+                FsCourseLink fsCourseLink = fsCourseLinkMapper.selectExpireLinkByQwExternalId(param.getQwUserId(), param.getVideoId(), qwExternalId);
+                return R.error(566,"官方群发通用链接").put("courseLink",fsCourseLink);
+            }
+
             return R.ok();
 
         }else {
@@ -473,6 +507,9 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
             contact.setId(param.getQwExternalId());
             contact.setFsUserId(param.getUserId());
             qwExternalContactMapper.updateQwExternalContact(contact);
+
+            iSopUserLogsInfoService.updateSopUserInfoByExternalId(qwExternalId,param.getUserId());
+
             FsUser user = new FsUser();
             user.setUserId(param.getUserId());
             user.setIsAddQw(1);
@@ -492,6 +529,12 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
 
             log.setUpdateTime(new Date());
             courseWatchLogMapper.updateFsCourseWatchLog(log);
+
+            if (param.getLinkType()!=null&&param.getLinkType()==5){
+                FsCourseLink fsCourseLink = fsCourseLinkMapper.selectExpireLinkByQwExternalId(param.getQwUserId(), param.getVideoId(), qwExternalId);
+                return R.error(566,"官方群发通用链接").put("courseLink",fsCourseLink);
+            }
+
             return R.ok();
         }
     }

fs-service/src/main/java/com/fs/qw/mapper/QwUserMapper.java

@@ -44,7 +44,7 @@ public interface QwUserMapper extends BaseMapper<QwUser>
 
     public List<QwUser> batchGetQwUser(@Param("list") List<QwUserKeyDTO> qwUserId);
 
-    @Select("select welcome_text,qw_user_name from qw_user where id = #{id}")
+    @Select("select company_user_id,company_id,welcome_text,qw_user_name from qw_user where id = #{id}")
     public QwUser selectQwUserByIdByWeComeText(@Param("id") Long id);
 
     @Select("select * from qw_user where qw_user_id = #{qwUserId} and corp_id = #{corpId} ")

fs-service/src/main/java/com/fs/sop/mapper/SopUserLogsInfoMapper.java

@@ -187,15 +187,19 @@ public interface SopUserLogsInfoMapper {
     @DataSource(DataSourceType.SOP)
     @Update("update sop_user_logs_info set fs_user_id=#{fsUserId} where external_id =#{externalId}")
     int updateQwExternalContactChangeUserId(@Param("externalId") Long externalId,@Param("fsUserId") Long fsUserId);
+
     @DataSource(DataSourceType.SOP)
     @Select("SELECT external_id  FROM `sop_user_logs_info` where sop_id = #{sopId}  and Date(create_time) = Date(#{minDay})")
     List<SopUserLogsInfo> selectDayBySopId(@Param("sopId")String sopId, @Param("minDay")String minDay);
+
     @DataSource(DataSourceType.SOP)
     @Select("SELECT external_id,create_time  FROM sop_user_logs_info where sop_id = #{sopId} ")
     List<SopUserLogsInfo> selectSopUserLogsInfoBySopId(@Param("sopId")String sopId);
+
     @DataSource(DataSourceType.SOP)
     @Select("SELECT id  FROM sop_user_logs_info where external_id = #{extId} ")
     List<String> selectSopUserLogsInfoByExtId(@Param("extId")Long extId );
+
     @DataSource(DataSourceType.SOP)
     void updateSopUserLogsInfoFsUserIdById(@Param("data")List<String> list,  @Param("userId") Long userId);
 

fs-service/src/main/java/com/fs/sop/service/IQwSopLogsService.java

@@ -92,13 +92,16 @@ public interface IQwSopLogsService
      * 创建企业群发
      */
     public void createCorpMassSending(String date);
-
+    /**
+     *  创建企业群发(按照营期发)
+     */
+    public void createCorpMassSendingByUserLogs(String date);
 
     /**
      *  检索执行符合条件的定时任务的结果回调(企业微信)
      */
     public void qwSopLogsResult();
-
+    public void qwSopLogsResultNew() throws InterruptedException;
 
     public int updateQwSopLogsByWatchLogType(String id,String remark);
 

fs-service/src/main/java/com/fs/sop/service/ISopUserLogsInfoService.java

@@ -21,6 +21,11 @@ public interface ISopUserLogsInfoService {
      */
     void update(SopUserLogsInfo info);
 
+    /**
+     * 修改
+     */
+    void updateSopUserInfoByExternalId(Long qwExternalId,Long userId);
+
     /**
      * 根据ID查询记录
      * @param id 主键ID

fs-service/src/main/java/com/fs/sop/service/impl/QwSopLogsServiceImpl.java

@@ -47,10 +47,8 @@ import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -527,12 +525,139 @@ public class QwSopLogsServiceImpl implements IQwSopLogsService
                 qwSopLogs.size(), (endTime - startTime));
     }
 
+    @Override
+    public void qwSopLogsResultNew() {
+
+        logger.info("开始执行企业微信群发消息结果查询任务");
+        long startTime = System.currentTimeMillis();
+
+        List<QwSopLogs> qwSopLogsList = qwSopLogsMapper.selectSopLogsByCreateCorpMassSendResult();
+        if (qwSopLogsList.isEmpty()) {
+            logger.info("没有需要查询结果的群发消息记录");
+            return;
+        }
+
+
+        Map<String, List<QwSopLogs>> grouped = qwSopLogsList.stream().collect(
+                Collectors.groupingBy(log -> log.getQwUserid() + "|" + log.getCorpId() + "|" + log.getMsgId())
+        );
+        for (Map.Entry<String, List<QwSopLogs>> entry : grouped.entrySet()) {
+            String key = entry.getKey();
+            List<QwSopLogs> corpLogs = entry.getValue();
+
+            String[] keys = key.split("\\|");
+            String qwUserid = keys[0];
+            String corpId = keys[1];
+            String msgID = keys[2];
+
+            QwGetGroupmsgSendParam param = new QwGetGroupmsgSendParam();
+            param.setMsgid(msgID);
+            param.setUserid(qwUserid);
+            param.setLimit(1000);
+
+            fetchAndProcessAllPages(param, corpId, corpLogs, msgID);
+
+        }
+
+        long endTime = System.currentTimeMillis();
+        logger.info("企业微信群发消息结果查询任务完成，处理记录总数: {}，总耗时: {}ms",
+                qwSopLogsList.size(), (endTime - startTime));
+
+    }
+
+    private void fetchAndProcessAllPages(QwGetGroupmsgSendParam param, String corpId, List<QwSopLogs> logs, String msgId) {
+        String nextCursor = null;
+
+        do {
+            param.setCursor(nextCursor);
+            QwGroupmsgSendResult result = qwApiService.getGroupmsgSendResult(param, corpId);
+
+            if (result == null) {
+                logger.error("接口调用失败: {}", param);
+                return;
+            }
+
+            if (result.getErrCode() == 45033) {
+                try {
+                    Thread.sleep(2000 + new Random().nextInt(1000));
+                    result = qwApiService.getGroupmsgSendResult(param, corpId);
+                } catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
+                    logger.error("线程中断", e);
+                    return;
+                }
+            }
+
+            if (result.getErrCode() != 0) {
+                logger.error("查询失败: {}, errCode: {}, errMsg: {}", param, result.getErrCode(), result.getErrMsg());
+                return;
+            }
+
+            processPageResult(result, logs, corpId, msgId);
+            nextCursor = result.getNextCursor();
+
+        } while (nextCursor != null && !nextCursor.isEmpty());
+    }
+
+
+    private void processPageResult(QwGroupmsgSendResult result, List<QwSopLogs> logs, String corpId, String msgId) {
+        Map<String, SendItemResult> sendMap = result.getSendList().stream()
+                .collect(Collectors.toMap(
+                        r -> r.getUserId() + "_" + r.getExternalUserId() + "_" + corpId + "_" + msgId,
+                        Function.identity(),
+                        (a, b) -> a  // 如果重复，保留第一个
+                ));
+
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        String now = LocalDateTime.now().format(formatter);
+
+        // 只处理匹配得上的记录
+        List<QwSopLogs> matchedLogs = new ArrayList<>();
+
+        for (QwSopLogs log : logs) {
+            String logKey = log.getQwUserid() + "_" + log.getExternalUserId() + "_" + log.getCorpId() + "_" + msgId;
+            SendItemResult matched = sendMap.get(logKey);
+
+            if (matched != null) {
+
+                switch (matched.getStatus()) {
+                    case 0:
+                        log.setSendStatus(5L);
+                        log.setRemark("员工未发送,已作废");
+                        break;
+                    case 1:
+                        log.setSendStatus(1L);
+                        log.setReceivingStatus(1L);
+                        break;
+                    case 2:
+                    case 3:
+                        log.setSendType(2);
+                        log.setSendStatus(3L);
+                        log.setRemark("客户无法接收,补发");
+                        log.setReceivingStatus(0L);
+                        log.setSendTime(now);
+                        log.setSort(30000001);
+                        break;
+                    default:
+                        break;
+                }
+
+                matchedLogs.add(log);
+            }
+        }
+
+        if (!matchedLogs.isEmpty()) {
+            batchUpdateDatabase(matchedLogs);
+        }
+    }
+
+
     /**
      * 批量更新数据库
      * @param updateList 需要更新的记录列表
      */
     private void batchUpdateDatabase(List<QwSopLogs> updateList) {
-        int updateBatchSize = 1000;
+        int updateBatchSize = 500;
         for (int i = 0; i < updateList.size(); i += updateBatchSize) {
             int endIndex = Math.min(i + updateBatchSize, updateList.size());
             List<QwSopLogs> batch = updateList.subList(i, endIndex);
@@ -545,7 +670,6 @@ public class QwSopLogsServiceImpl implements IQwSopLogsService
         }
     }
 
-
     @Override
     public int updateQwSopLogsByWatchLogType(String id,String remark) {
         return qwSopLogsMapper.updateQwSopLogsByWatchLogType(id,remark);
@@ -1255,7 +1379,7 @@ public class QwSopLogsServiceImpl implements IQwSopLogsService
                                             if (content == null || content.getSetting() == null) continue;
                                             Long courseId = content.getCourseId();
                                             for (QwSopTempSetting.Content.Setting set : content.getSetting()) {
-                                                processContent(set, corpId, templateSop, attachments, courseId,config);
+                                                processContent(set, corpId, templateSop, attachments, courseId);
                                             }
                                         } catch (Exception e) {
                                             logger.error("消息内容解析失败，logId：{}", log.getId(), e);
@@ -1337,10 +1461,267 @@ public class QwSopLogsServiceImpl implements IQwSopLogsService
         logger.info("企业微信群发消息创建任务执行完成，总耗时: {} 毫秒", (endTime - startTime));
     }
 
+    // 处理不同类型的内容
+//    private void processContent(QwSopTempSetting.Content.Setting set, String corpId,
+//                                QwMsgTemplateSop templateSop, List<QwMsgTemplateSop.Attachment> attachments
+//                                ,Long courseId,CourseConfig config) {
+//        switch (set.getContentType()) {
+//            case "1":
+//                templateSop.setTextContent(set.getValue());
+//                break;
+//            case "2":
+//                handleImageAttachment(set, corpId, attachments);
+//                break;
+//            case "3":
+//                handleLinkAttachment(set, corpId, attachments);
+//                break;
+//            case "4":
+//                handleMiniProgramAttachment(set, corpId, attachments,courseId,config);
+//                break;
+//        }
+//    }
+//
+//    // 处理图片附件
+//    private void handleImageAttachment(QwSopTempSetting.Content.Setting set, String corpId,
+//                                       List<QwMsgTemplateSop.Attachment> attachments) {
+//        if (StringUtils.isNotEmpty(set.getImgUrl())) {
+//            try {
+//                QwUploadImgResult result = qwApiService.uploadimgs(set.getImgUrl(), corpId);
+//                if (result.getErrcode() == 0) {
+//                    QwMsgTemplateSop.Attachment attachment = new QwMsgTemplateSop.Attachment();
+//                    attachment.setType(2);
+//                    attachment.setImagePicUrl(result.getUrl());
+//                    attachments.add(attachment);
+//                }
+//            } catch (Exception e) {
+//                logger.error("图片上传失败", e);
+//            }
+//        }
+//    }
+//
+//    // 处理链接附件
+//    private void handleLinkAttachment(QwSopTempSetting.Content.Setting set, String corpId,
+//                                      List<QwMsgTemplateSop.Attachment> attachments) {
+//        if (StringUtils.isNotEmpty(set.getLinkImageUrl())) {
+//            try {
+////                QwUploadImgResult result = qwApiService.uploadimgs(set.getLinkImageUrl(), corpId);
+////                if (result.getErrcode() == 0) {
+//                    QwMsgTemplateSop.Attachment attachment = new QwMsgTemplateSop.Attachment();
+//                    attachment.setType(3);
+//                    attachment.setLinkTitle(set.getLinkTitle());
+//                    attachment.setLinkPicurl(set.getLinkImageUrl());
+//                    attachment.setLinkDesc(set.getLinkDescribe());
+//                    attachment.setLinkUrl(set.getLinkUrl());
+//                    attachments.add(attachment);
+////                }
+//            } catch (Exception e) {
+//                logger.error("链接图片上传失败", e);
+//            }
+//        }
+//    }
+//
+//    private void handleMiniProgramAttachment(QwSopTempSetting.Content.Setting set, String corpId,
+//                                             List<QwMsgTemplateSop.Attachment> attachments,
+//                                             Long courseId,CourseConfig config) {
+//        if (StringUtils.isNotEmpty(set.getMiniprogramPage())) {
+//            try {
+//                String key = String.format("miniprogram:%s:%s", corpId, courseId);
+//                String mediaId = redisCache.getCacheObject(key);
+//
+//                if (StringUtils.isNotEmpty(mediaId)) {
+//
+//                    QwMsgTemplateSop.Attachment attachment = new QwMsgTemplateSop.Attachment();
+//                    attachment.setType(4);
+////                    attachment.setMiniProgramTitle(set.getMiniprogramTitle());
+//                    //强制限制
+//                    String title = set.getMiniprogramTitle() != null ? set.getMiniprogramTitle() : "";
+//                    int maxLength = 20;
+//                    attachment.setMiniProgramTitle(title.length() > maxLength ? title.substring(0, maxLength) : title);
+//
+//                    attachment.setMiniProgramPicMediaId(mediaId);
+//
+//                    if (StringUtil.strIsNullOrEmpty(config.getMiniprogramAppid())){
+//                        logger.error("小程序配置为空，设置成固定的默认值。");
+//                        attachment.setMiniProgramAppId("wxc84c6f789ba7f176");
+//                    }else {
+//                        attachment.setMiniProgramAppId(config.getMiniprogramAppid());
+//                    }
+//
+//                    attachment.setMiniProgramPage(set.getMiniprogramPage());
+//                    attachments.add(attachment);
+//                } else {
+//                    logger.error("未找到小程序图片mediaId, corpId:{}, courseId:{}", corpId, courseId);
+//                }
+//            } catch (Exception e) {
+//                logger.error("获取小程序图片mediaId失败", e);
+//            }
+//        }
+//    }
+
+    @Override
+    public void createCorpMassSendingByUserLogs(String date) {
+
+        long startTime = System.currentTimeMillis();
+        logger.info("开始执行企业微信群发消息创建任务");
+
+        List<QwSopLogs> qwSopLogsList = qwSopLogsMapper.selectSopLogsByCreateCorpMassSending(date);
+        if (qwSopLogsList.isEmpty()) {
+            logger.error("zyp \n【企微官方群发记录为空】");
+            return;
+        }
+
+        Map<String, List<QwSopLogs>> grouped = qwSopLogsList.stream().collect(
+                Collectors.groupingBy(log -> log.getQwUserid() + "|" + log.getCorpId() + "|" + log.getSopId() + "|" + log.getUserLogsId())
+        );
+
+        int threadCount = Math.min(10, Runtime.getRuntime().availableProcessors() + 1);
+        ExecutorService executor = Executors.newFixedThreadPool(threadCount);
+        Queue<QwSopLogs> updateQueue = new ConcurrentLinkedQueue<>();
+
+        try {
+            // 并行提交所有分组
+            List<CompletableFuture<Void>> futures = grouped.values().stream()
+                    .map(group -> CompletableFuture.runAsync(() -> handleGroup(group, updateQueue), executor))
+                    .collect(Collectors.toList());
+
+            // 等待所有任务完成
+            CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).join();
+        } catch (Exception e) {
+            logger.error("批量并发执行异常", e);
+        } finally {
+            executor.shutdown();
+            try {
+                if (!executor.awaitTermination(300, TimeUnit.SECONDS)) {
+                    logger.error("Executor 未完全关闭");
+                }
+            } catch (InterruptedException ie) {
+                Thread.currentThread().interrupt();
+            }
+        }
+
+        // 批量更新发送状态
+        batchUpdate(updateQueue);
+
+        long endTime = System.currentTimeMillis();
+        logger.info("企业微信群发任务完成，总耗时：{} 毫秒，更新记录数：{}",
+                endTime - startTime, updateQueue.size());
+
+    }
+
+    private void handleGroup(List<QwSopLogs> logsGroup, Queue<QwSopLogs> updateQueue) {
+
+        try {
+            String firstKey = logsGroup.get(0).getCorpId() + "|" + logsGroup.get(0).getQwUserid();
+            String[] keyParts = firstKey.split("\\|");
+            String corpId = keyParts[0].trim();
+            String qwUserid = keyParts[1].trim();
+
+            QwUser qwUser = qwExternalContactService.getQwUserByRedis(corpId, qwUserid);
+            if (qwUser == null || qwUser.getIsDel() != 0) {
+                logger.error("员工信息无效-不存在或被删除，corpId:{}，userId:{}", corpId, qwUserid);
+                logsGroup.forEach(log -> {
+                    log.setSendStatus(3L);
+                    log.setRemark("员工信息无效");
+                    updateQueue.add(log);
+                });
+                return;
+            }
+
+            // 提取内容与目标客户列表
+            String contentJson = logsGroup.get(0).getContentJson();
+            QwSopTempSetting.Content content = JSON.parseObject(contentJson, QwSopTempSetting.Content.class);
+            if (content == null || content.getSetting() == null || content.getSetting().isEmpty()) {
+                logger.warn("消息内容为空或格式异常，key={}，json={} ", firstKey, contentJson);
+                logsGroup.forEach(log -> {
+                    log.setSendStatus(3L);
+                    log.setRemark("消息内容为空或格式异常");
+                    updateQueue.add(log);
+                });
+                return;
+            }
+
+            QwMsgTemplateSop template = new QwMsgTemplateSop();
+            template.setChatType("single");
+            template.setAllowSelect(false);
+            template.setSender(qwUserid);
+
+            List<String> externalUserIds = logsGroup.stream()
+                    .map(QwSopLogs::getExternalUserId)
+                    .filter(Objects::nonNull)
+                    .map(String::trim)
+                    .filter(s -> !s.isEmpty())
+                    .collect(Collectors.toList());
+            template.setExternalUseridList(externalUserIds);
+
+            List<QwMsgTemplateSop.Attachment> attachments = new ArrayList<>();
+            // 解析并填充消息体
+            for (QwSopTempSetting.Content.Setting set : content.getSetting()) {
+                processContent(set, corpId, template, attachments, content.getCourseId());
+            }
+            template.setAttachments(attachments);
+
+            // 调用企业微信接口
+            QwAddMsgTemplateResult result = qwApiService.addMsgTemplateBySop(template, corpId);
+
+            int errCode = result.getErrCode();
+            String errMsg = result.getErrMsg();
+            Integer nowSort = (errCode == 0 || errCode == 41063) ? 1 : 3;
+            String remark;
+            if (errCode == 0 || errCode == 41063) {
+                remark = null;
+            } else if (errCode == 45033) {
+                remark = "官方接口达到上限补发";
+            } else {
+                remark = "官方有误,sop补发";
+            }
+
+            LocalDateTime now = LocalDateTime.now();
+            String sendTime = now.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+
+            // 收集更新项
+            for (QwSopLogs log : logsGroup) {
+                if (errCode == 0 || errCode == 41063) {
+                    log.setSendStatus(1L);
+                    log.setMsgId(result.getMsgId());
+                } else {
+                    log.setSendType(2);
+                    log.setSendStatus(3L);
+                    log.setRemark(remark);
+                    log.setReceivingStatus(0L);
+                    log.setSendTime(sendTime);
+                    log.setSort(nowSort);
+                }
+                updateQueue.add(log);
+            }
+
+            if (errCode != 0 && errCode != 41063) {
+                logger.error("企业微信接口-消息发送失败-进入sop补偿，corpId：{}，errCode：{}，errMsg：{}",
+                        corpId, errCode, errMsg);
+            }
+
+        } catch (Exception e) {
+            logger.error("处理分组异常", e);
+        }
+    }
+
+    /**
+     * 批量更新发送状态
+     */
+    private void batchUpdate(Collection<QwSopLogs> toUpdate) {
+        if (toUpdate.isEmpty()) return;
+        logger.info("开始批量更新，记录数量：{}", toUpdate.size());
+        List<QwSopLogs> list = new ArrayList<>(toUpdate);
+        int batchSize = 500;
+        for (int i = 0; i < list.size(); i += batchSize) {
+            int end = Math.min(i + batchSize, list.size());
+            List<QwSopLogs> subList = list.subList(i, end);
+            qwSopLogsMapper.batchUpdateStatus(subList);
+        }
+    }
+
     // 处理不同类型的内容
     private void processContent(QwSopTempSetting.Content.Setting set, String corpId,
-                                QwMsgTemplateSop templateSop, List<QwMsgTemplateSop.Attachment> attachments
-                                ,Long courseId,CourseConfig config) {
+                                QwMsgTemplateSop templateSop, List<QwMsgTemplateSop.Attachment> attachments,Long courseId) {
         switch (set.getContentType()) {
             case "1":
                 templateSop.setTextContent(set.getValue());
@@ -1352,7 +1733,7 @@ public class QwSopLogsServiceImpl implements IQwSopLogsService
                 handleLinkAttachment(set, corpId, attachments);
                 break;
             case "4":
-                handleMiniProgramAttachment(set, corpId, attachments,courseId,config);
+                handleMiniProgramAttachment(set, corpId, attachments,courseId);
                 break;
         }
     }
@@ -1382,13 +1763,13 @@ public class QwSopLogsServiceImpl implements IQwSopLogsService
             try {
 //                QwUploadImgResult result = qwApiService.uploadimgs(set.getLinkImageUrl(), corpId);
 //                if (result.getErrcode() == 0) {
-                    QwMsgTemplateSop.Attachment attachment = new QwMsgTemplateSop.Attachment();
-                    attachment.setType(3);
-                    attachment.setLinkTitle(set.getLinkTitle());
-                    attachment.setLinkPicurl(set.getLinkImageUrl());
-                    attachment.setLinkDesc(set.getLinkDescribe());
-                    attachment.setLinkUrl(set.getLinkUrl());
-                    attachments.add(attachment);
+                QwMsgTemplateSop.Attachment attachment = new QwMsgTemplateSop.Attachment();
+                attachment.setType(3);
+                attachment.setLinkTitle(set.getLinkTitle());
+                attachment.setLinkPicurl(set.getLinkImageUrl());
+                attachment.setLinkDesc(set.getLinkDescribe());
+                attachment.setLinkUrl(set.getLinkUrl());
+                attachments.add(attachment);
 //                }
             } catch (Exception e) {
                 logger.error("链接图片上传失败", e);
@@ -1396,9 +1777,7 @@ public class QwSopLogsServiceImpl implements IQwSopLogsService
         }
     }
 
-    private void handleMiniProgramAttachment(QwSopTempSetting.Content.Setting set, String corpId,
-                                             List<QwMsgTemplateSop.Attachment> attachments,
-                                             Long courseId,CourseConfig config) {
+    private void handleMiniProgramAttachment(QwSopTempSetting.Content.Setting set, String corpId, List<QwMsgTemplateSop.Attachment> attachments,Long courseId) {
         if (StringUtils.isNotEmpty(set.getMiniprogramPage())) {
             try {
                 String key = String.format("miniprogram:%s:%s", corpId, courseId);
@@ -1413,16 +1792,8 @@ public class QwSopLogsServiceImpl implements IQwSopLogsService
                     String title = set.getMiniprogramTitle() != null ? set.getMiniprogramTitle() : "";
                     int maxLength = 20;
                     attachment.setMiniProgramTitle(title.length() > maxLength ? title.substring(0, maxLength) : title);
-
                     attachment.setMiniProgramPicMediaId(mediaId);
-
-                    if (StringUtil.strIsNullOrEmpty(config.getMiniprogramAppid())){
-                        logger.error("小程序配置为空，设置成固定的默认值。");
-                        attachment.setMiniProgramAppId("wxc84c6f789ba7f176");
-                    }else {
-                        attachment.setMiniProgramAppId(config.getMiniprogramAppid());
-                    }
-
+                    attachment.setMiniProgramAppId(set.getMiniprogramAppid());
                     attachment.setMiniProgramPage(set.getMiniprogramPage());
                     attachments.add(attachment);
                 } else {
@@ -1435,5 +1806,4 @@ public class QwSopLogsServiceImpl implements IQwSopLogsService
     }
 
 
-
 }

fs-service/src/main/java/com/fs/sop/service/impl/SopUserLogsInfoServiceImpl.java

@@ -157,6 +157,11 @@ public class SopUserLogsInfoServiceImpl implements ISopUserLogsInfoService {
         sopUserLogsInfoMapper.updateById(info);
     }
 
+    @Override
+    public void updateSopUserInfoByExternalId(Long qwExternalId, Long userId) {
+        sopUserLogsInfoMapper.updateQwExternalContactChangeUserId(qwExternalId,userId);
+    }
+
     @Override
     public SopUserLogsInfo getById(String id) {
         return sopUserLogsInfoMapper.selectById(id);
@@ -664,6 +669,14 @@ public class SopUserLogsInfoServiceImpl implements ISopUserLogsInfoService {
             if (StringUtils.isEmpty(domainName)){
                 domainName = config.getRealLinkDomainName();
             }
+
+            QwCompany qwCompany = iQwCompanyService.getQwCompanyByRedis(param.getCorpId());
+
+            if (qwCompany == null ) {
+                return  R.error().put("msg","企业不存在，请联系管理员");
+            }
+
+
             String finalDomainName = domainName;
             sopUserLogsInfos.forEach(item->{
 
@@ -746,14 +759,14 @@ public class SopUserLogsInfoServiceImpl implements ISopUserLogsInfoService {
                             String linkByMiniApp = createLinkByMiniApp(st, param.getCorpId(), createTime, param.getCourseId(), param.getVideoId(),
                                     qwUserId, companyUserId, companyId, item.getExternalId(), config);
 
-                            if (StringUtil.strIsNullOrEmpty(config.getMiniprogramAppid())){
-                                log.error("配置中无小程序id，采用默认的");
-                                st.setMiniprogramAppid("wxc84c6f789ba7f176");
+                            if (StringUtil.strIsNullOrEmpty(qwCompany.getMiniAppId())){
+                                log.error("企业未配置小程序-"+param.getCorpId());
                             }else {
-                                st.setMiniprogramAppid(config.getMiniprogramAppid());
+                                //置换各自的小程序
+                                st.setMiniprogramAppid(qwCompany.getMiniAppId());
                             }
-
                             st.setMiniprogramPage(linkByMiniApp);
+
                             break;
                         //app
                         case "9":

fs-service/src/main/resources/mapper/sop/QwSopLogsMapper.xml

@@ -383,7 +383,7 @@
           and ql.receiving_status = 0
           and ql.send_time <= now()
         order by ql.sort DESC ,ql.send_time asc
-            LIMIT 1
+            LIMIT 2
         ]]>
     </select>