修改接口

common-module/src/main/java/com/tzld/piaoquan/growth/common/dao/mapper/WeComUserMapper.java

@@ -37,13 +37,18 @@ public interface WeComUserMapper {
 
     void insertList(@Param("list") List<WeComUser> list);
 
-    List<WeComUser> selectSendUserList(@Param("staffId") Long staffId,
-                        @Param("groupMsgDisabled") byte groupMsgDisabled,
-                        @Param("pageNum") Integer pageNum,
-                        @Param("pageSize") Integer pageSize);
+    List<WeComUser> selectUserList(@Param("staffId") Long staffId,
+                                   @Param("groupMsgDisabled") byte groupMsgDisabled,
+                                   @Param("pageNum") Integer pageNum,
+                                   @Param("pageSize") Integer pageSize);
 
-    List<WeComUser> selectNotSendUserList(@Param("staffId") Long staffId,
+    List<WeComUser> selectSendUserList(@Param("staffId") Long staffId,
                                        @Param("groupMsgDisabled") byte groupMsgDisabled,
                                        @Param("pageNum") Integer pageNum,
                                        @Param("pageSize") Integer pageSize);
+
+    List<WeComUser> selectNotSendUserList(@Param("staffId") Long staffId,
+                                          @Param("groupMsgDisabled") byte groupMsgDisabled,
+                                          @Param("pageNum") Integer pageNum,
+                                          @Param("pageSize") Integer pageSize);
 }

common-module/src/main/resources/mapper/WeComUserMapper.xml

@@ -472,4 +472,13 @@
                                  or (create_time between '2025-03-03 10:00:00' and '2025-03-03 17:00:00')
                                   and staff_id = #{staffId,jdbcType=BIGINT}) limit #{pageNum}, #{pageSize}
     </select>
+
+    <select id="selectUserList" resultType="com.tzld.piaoquan.growth.common.model.po.WeComUser">
+        select t1.*
+        from we_com_user t1
+                 left join we_com_staff_with_user t2 on t1.id = t2.user_id
+        where t1.group_msg_disabled = #{groupMsgDisabled,jdbcType=TINYINT}
+          and t2.staff_id = #{staffId,jdbcType=BIGINT} and t2.is_delete = 0
+            limit #{pageNum}, #{pageSize}
+    </select>
 </mapper>

offline-module/src/main/java/com/tzld/piaoquan/offline/job/WeComMessageDataJob.java

@@ -277,12 +277,12 @@ public class WeComMessageDataJob {
         List<Long> staffIds = new ArrayList<>();
         staffIds.add(staffId);
         init(staffIds);
-        List<WeComUser> weComUserList;
-        if (isSend) {
-            weComUserList = weComUserMapper.selectSendUserList(staffId, (byte) 1, (pageNum - 1) * pageSize, pageSize);
-        } else {
-            weComUserList = weComUserMapper.selectNotSendUserList(staffId, (byte) 1, (pageNum - 1) * pageSize, pageSize);
-        }
+        List<WeComUser> weComUserList = weComUserMapper.selectUserList(staffId, (byte) 1, (pageNum - 1) * pageSize, pageSize);
+//        if (isSend) {
+//            weComUserList = weComUserMapper.selectSendUserList(staffId, (byte) 1, (pageNum - 1) * pageSize, pageSize);
+//        } else {
+//            weComUserList = weComUserMapper.selectNotSendUserList(staffId, (byte) 1, (pageNum - 1) * pageSize, pageSize);
+//        }
 
         //落库逻辑
         List<SendMessage> allSeneMessageList = new ArrayList<>();
@@ -451,7 +451,7 @@ public class WeComMessageDataJob {
 
 
     @XxlJob("pushSendMessageJob")
-    public ReturnT<String> pushSendMessage(String param, boolean hasLink, boolean hasImage, boolean hasMiniprogram) {
+    public ReturnT<String> pushSendMessage(String param) {
         XxlJobParam xxlJobParam = new XxlJobParam();
         if (StringUtils.isNotEmpty(param)) {
             xxlJobParam = JSONObject.parseObject(param, XxlJobParam.class);
@@ -472,7 +472,7 @@ public class WeComMessageDataJob {
             return ReturnT.SUCCESS;
         }
         for (SendMessage sendMessage : groupList) {
-            pushAndUpdateMessage(sendMessage, hasLink, hasImage, hasMiniprogram);
+            pushAndUpdateMessage(sendMessage);
         }
         Map<Long, List<SendMessage>> groupedByStaffId = groupList.stream().collect(Collectors.groupingBy(SendMessage::getStaffId));
         for (Map.Entry<Long, List<SendMessage>> entry : groupedByStaffId.entrySet()) {
@@ -486,7 +486,7 @@ public class WeComMessageDataJob {
                 retryGroupList = retryGroupList.stream().filter(e -> Objects.equals(e.getStaffId(), entry.getKey()))
                         .collect(Collectors.toList());
                 for (SendMessage sendMessage : retryGroupList) {
-                    pushAndUpdateMessage(sendMessage, hasLink, hasImage, hasMiniprogram);
+                    pushAndUpdateMessage(sendMessage);
                 }
             }
         }
@@ -499,11 +499,11 @@ public class WeComMessageDataJob {
         return ReturnT.SUCCESS;
     }
 
-    private void pushAndUpdateMessage(SendMessage sendMessage, boolean hasLink, boolean hasImage, boolean hasMiniprogram) {
+    private void pushAndUpdateMessage(SendMessage sendMessage) {
         sendMessage.setIsSend(0);
         sendMessage.setCreateTime(DateUtil.getThatDayDate());
         List<String> sendUserList = sendMessageMapper.selectExternalUserId(sendMessage);
-        boolean flag = pushMessage(sendUserList, sendMessage, hasLink, hasImage, hasMiniprogram);
+        boolean flag = pushMessage(sendUserList, sendMessage, false, false, false);
         if (flag) {
             SendMessage updateSendMessage = new SendMessage();
             updateSendMessage.setIsSend(1);
@@ -530,7 +530,7 @@ public class WeComMessageDataJob {
         JSONObject text = new JSONObject();
 //        String content = messageService.getMessageText();
 //        text.put("content", content);
-        text.put("content", "叔叔阿姨好，明天就是“二月二，龙抬头”龙头节是中国的传统节日，主要活动包括祈福丰收、驱邪纳祥等，具体习俗如下：1、祭祀仪式；2、色饮食；3、驱虫祈福；4、禁忌与习俗；5、现代活动...这里是你的智能AI私人管家——小圈，想了解更多详情，戳我查看\uD83D\uDC47\uD83C\uDFFB\uD83D\uDC47\uD83C\uDFFB\uD83D\uDC47\uD83C\uDFFB");
+        text.put("content", "芳华这儿还藏着【养生秘诀】和【老歌金曲】！您想先看哪个？");
         jsonObject.put("text", text);
         jsonObject.put("sender", staff.getCarrierId());
         JSONArray attachments = new JSONArray();