侧边栏发官方通用链接

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

@@ -143,25 +143,46 @@ public interface QwExternalContactMapper extends BaseMapper<QwExternalContact> {
             "and qec.gender = #{map.gender} " +
             "</if> " +
 
-            "<if test ='map.selectType ==2 and map.groupChatSelectList.size()!=0 '> " +
+            "<if test ='map.selectType ==2 and !map.groupChatSelectList.isEmpty() '> " +
             " and qcu.chat_id in  <foreach collection='map.groupChatSelectList'  item='item' index='index'  open='(' separator=',' close=')'> #{item} </foreach> " +
             "</if> " +
 
-            "<if test ='map.selectType ==2 and map.tagsIdsSelectList.size()!=0 '> " +
+            "<if test ='map.selectType ==2 and !map.tagsIdsSelectList.isEmpty() '> " +
             " and <foreach collection='map.tagsIdsSelectList'  item='item' index='index'  open='( 1=2 ' separator='' close=')'> or find_in_set(  #{item} , REGEXP_REPLACE ( qec.tag_ids, '[\"\\\\[\\\\]]', '' ) )  </foreach> " +
             "</if> " +
 
-            "<if test ='map.selectType ==2 and map.outTagsIdsSelectList.size()!=0 '> " +
+            "<if test ='map.selectType ==2 and !map.outTagsIdsSelectList.isEmpty() '> " +
             " and <foreach collection='map.outTagsIdsSelectList'  item='item' index='index'  open='( 1=2 ' separator='' close=')'> or not find_in_set(  #{item} , REGEXP_REPLACE ( qec.tag_ids, '[\"\\\\[\\\\]]', '' ) )  </foreach> " +
             "</if> " +
 
-            "<if test ='map.selectType ==2 and map.timeScreenCharge.size()!=0 and map.timeScreenCharge != null and map.timeScreenCharge.size() == 2 '> " +
+            "<if test ='map.selectType ==2 and !map.timeScreenCharge.isEmpty()and map.timeScreenCharge != null and map.timeScreenCharge.size() == 2 '> " +
             " and qec.create_time BETWEEN #{map.timeScreenCharge[0]} and #{map.timeScreenCharge[1]}" +
             "</if> " +
 
             "</script>")
     public ArrayList<String> selectQwGroupMsgExpectCustomerList(@Param("map")QwCountCustomerParam userIdList, @Param("corpId") String corpId);
 
+    @Select("<script>" +
+            "SELECT " +
+            " DISTINCT qec.external_user_id AS externalUserIdS " +
+            " FROM " +
+            " qw_external_contact qec " +
+            " WHERE " +
+            " qec.status = 0 and " +
+            " qec.user_id IN " +
+            " <foreach collection='map.userIdsSelectList'  item='item' index='index'  open='(' separator=',' close=')'> #{item} </foreach> " +
+            " AND qec.corp_id = #{corpId} " +
+            "<if test ='map.selectType ==2 and !map.tagsIdsSelectList.isEmpty() '> " +
+            " and <foreach collection='map.tagsIdsSelectList'  item='item' index='index'  open='( 1=2 ' separator='' close=')'> or find_in_set(  #{item} , REGEXP_REPLACE ( qec.tag_ids, '[\"\\\\[\\\\]]', '' ) )  </foreach> " +
+            "</if> " +
+
+            "<if test ='map.selectType ==2 and !map.outTagsIdsSelectList.isEmpty() '> " +
+            " and <foreach collection='map.outTagsIdsSelectList'  item='item' index='index'  open='( 1=2 ' separator='' close=')'> or not find_in_set(  #{item} , REGEXP_REPLACE ( qec.tag_ids, '[\"\\\\[\\\\]]', '' ) )  </foreach> " +
+            "</if> " +
+
+            "</script>")
+    public ArrayList<String> selectQwGroupMsgExpectListBySidebar(@Param("map")QwCountCustomerParam userIdList, @Param("corpId") String corpId);
+
     /**
      * 查询企业微信客户列表
      *

fs-service/src/main/java/com/fs/qw/service/IQwExternalContactService.java

@@ -46,6 +46,7 @@ public interface IQwExternalContactService extends IService<QwExternalContact> {
      * 预计发送消息人员的客户列表
      */
     public ArrayList<String> selectQwGroupMsgExpectCustomerList(QwCountCustomerParam userIdList, String corpId);
+    public ArrayList<String> selectQwGroupMsgExpectListBySidebar(QwCountCustomerParam userIdList, String corpId);
 
     /**
      *  统计预期发送消息人员的客户总数

fs-service/src/main/java/com/fs/qw/service/impl/QwExternalContactServiceImpl.java

@@ -763,6 +763,17 @@ public class QwExternalContactServiceImpl extends ServiceImpl<QwExternalContactM
         return qwExternalContactMapper.selectQwGroupMsgExpectCustomerList(userIdList, corpId);
     }
 
+
+    /**
+     * 预计发送消息人员的客户列表
+     */
+
+    @Override
+    public ArrayList<String> selectQwGroupMsgExpectListBySidebar(QwCountCustomerParam userIdList, String corpId) {
+
+        return qwExternalContactMapper.selectQwGroupMsgExpectListBySidebar(userIdList, corpId);
+    }
+
     /**
      * 查询企业微信客户列表
      *

fs-service/src/main/java/com/fs/qw/service/impl/QwGroupMsgServiceImpl.java

@@ -752,25 +752,25 @@ public class QwGroupMsgServiceImpl implements IQwGroupMsgService
         if (StringUtil.strIsNullOrEmpty(qwCompany.getMiniAppId())){
             return  R.error("该主体没有绑定 小程序，请联系管理员");
         }
-
-        String mediaId =(String)redisCache.getCacheObject("miniprogram:"+qwGroupMsgParam.getCorpId()+":"+qwGroupMsgParam.getCourseId());
-        if (StringUtil.strIsNullOrEmpty(mediaId)){
-            return R.error("该课程封面未上传 至企业微信，请联系管理员");
-        }
+//
+//        String mediaId =(String)redisCache.getCacheObject("miniprogram:"+qwGroupMsgParam.getCorpId()+":"+qwGroupMsgParam.getCourseId());
+//        if (StringUtil.strIsNullOrEmpty(mediaId)){
+//            return R.error("该课程封面未上传 至企业微信，请联系管理员");
+//        }
 
         String linkByMiniApp = createLinkByMiniAppGeneral(new Date(), qwGroupMsgParam.getCourseId(), qwGroupMsgParam.getVideoId(), qwUser, 0L,2,null,1);
 
         msgTemplate.setSender(qwGroupMsgParam.getSender().trim());
         msgTemplate.setMiniprogramAppid(qwCompany.getMiniAppId());
         msgTemplate.setMiniprogramTitle(qwGroupMsgParam.getMiniprogramTitle());
-        msgTemplate.setMiniprogramPicMediaId(mediaId);
+        msgTemplate.setMiniprogramPicMediaId("mediaId");
         msgTemplate.setMiniprogramPage(linkByMiniApp);
 
         qwGroupMsgItem.setMsgType(3);
         qwGroupMsgItem.setMiniprogramTitle(qwGroupMsgParam.getMiniprogramTitle());
         qwGroupMsgItem.setMiniprogramAppid(qwCompany.getMiniAppId());
         qwGroupMsgItem.setMiniprogramPicUrl(qwGroupMsgParam.getMiniprogramPicUrl());
-        qwGroupMsgItem.setMiniprogramPicMediaId(mediaId);
+        qwGroupMsgItem.setMiniprogramPicMediaId("mediaId");
         qwGroupMsgItem.setMiniprogramPage(linkByMiniApp);
 
 
@@ -795,7 +795,7 @@ public class QwGroupMsgServiceImpl implements IQwGroupMsgService
         qwCountCustomerParam.setOutTagsIdsSelectList(qwGroupMsgParam.getOutTagsIdsSelectList());
 
         //根据 条件 筛选出预计发送的客户id列表
-        ArrayList<String> customerList = qwExternalContactService.selectQwGroupMsgExpectCustomerList(qwCountCustomerParam, qwCompany.getCorpId());
+        ArrayList<String> customerList = qwExternalContactService.selectQwGroupMsgExpectListBySidebar(qwCountCustomerParam, qwCompany.getCorpId());
 
         qwGroupMsg.setToUserNum(customerList.size());
         qwGroupMsg.setFilterCustomers(JSON.toJSONString(qwCountCustomerParam));