修改自动回复

api-module/src/main/java/com/tzld/piaoquan/api/service/impl/WeComAutoReplyImpl.java

@@ -101,12 +101,6 @@ public class WeComAutoReplyImpl implements WeComAutoReply {
             }
             if (msgData.getMsgType() == 3) {
                 JSONObject text = new JSONObject();
-//                String name = getName(externalUserId, corpId);
-//                if (StringUtils.hasText(name)) {
-//                    text.put("content", name + "，" + msgData.getTitle());
-//                } else {
-//                    text.put("content", msgData.getTitle());
-//                }
                 text.put("content", msgData.getTitle());
                 param.put("text", text);
             }

api-module/src/main/java/com/tzld/piaoquan/api/service/impl/WeComServiceImpl.java

@@ -122,15 +122,18 @@ public class WeComServiceImpl implements WeComService {
         ReplyStaff replyStaff = replyStaffs.get(0);
         List<WeComPushMessageVo> res = new ArrayList<>();
         ReplyBucketData replyBucketData = getPushMessageData(replyStaff.getUserId(), replyStaff.getVideoIds());
-        if (replyBucketData == null) {
-            return null;
+        if (replyBucketData == null || CollectionUtils.isEmpty(replyBucketData.getGroupList())) {
+            WeComPushMessageVo weComPushMessageVo = new WeComPushMessageVo();
+            weComPushMessageVo.setGroupIndex(0);
+            List<MsgData> msgDataList = new ArrayList<>();
+            MsgData msgData = getTextMsgData(replyStaff.getId(), replyStaff.getName());
+            msgDataList.add(msgData);
+            weComPushMessageVo.setMsgDataList(msgDataList);
+            res.add(weComPushMessageVo);
+            return res;
         }
         List<GroupData> groupList = replyBucketData.getGroupList();
         log.info("getPushMessageByUserId groupList={}", groupList);
-        if (CollectionUtils.isEmpty(groupList)) {
-            return null;
-        }
-        String name = replyStaff.getName();
         for (GroupData groupData : groupList) {
             if (CollectionUtils.isEmpty(groupData.getMsgDataList())) {
                 continue;
@@ -144,18 +147,7 @@ public class WeComServiceImpl implements WeComService {
                     msgData.setTitle(s);
                 }
             }
-            MsgData msgData = new MsgData();
-            msgData.setMsgType(3);
-            if (replyStaff.getId() == 1) {
-                msgData.setTitle("你好呀~我是智能助手芳华，专门陪您唠唠嗑、解解闷的！\uD83C\uDF39\n" +
-                        "刚发现好多有趣视频想分享给您！偷偷告诉我——您平时最爱看【健康养生】、【历史故事】这类知识干货，还是【人生智慧】【怀旧经典】这些暖心内容呀？\n" +
-                        "（悄悄加个选项\uD83D\uDC49【祝福音乐】\uD83C\uDFB5，马上帮您找！）");
-            } else if (replyStaff.getId() == 3) {
-                msgData.setTitle(String.format("很高兴认识您！我是%s，每天给您推荐精彩视频~", name));
-            } else {
-                msgData.setTitle("叔叔阿姨好，我是好看内容推荐官，每天会为您定制全网热点视频，感谢您的关注，手动转发支持哦~");
-            }
-
+            MsgData msgData = getTextMsgData(replyStaff.getId(), replyStaff.getName());
             msgDataList.add(0, msgData);
             weComPushMessageVo.setMsgDataList(msgDataList);
             res.add(weComPushMessageVo);
@@ -164,6 +156,23 @@ public class WeComServiceImpl implements WeComService {
         return res;
     }
 
+    private MsgData getTextMsgData(Long replyStaffId, String name) {
+        MsgData msgData = new MsgData();
+        msgData.setMsgType(3);
+        if (replyStaffId == 97) {
+            msgData.setTitle("欢迎加入票圈老年社区， 每天社群内为您推荐更多精彩视频内容，感谢您的关注！");
+        } else if (replyStaffId == 1) {
+            msgData.setTitle("你好呀~我是智能助手芳华，专门陪您唠唠嗑、解解闷的！\uD83C\uDF39\n" +
+                    "刚发现好多有趣视频想分享给您！偷偷告诉我——您平时最爱看【健康养生】、【历史故事】这类知识干货，还是【人生智慧】【怀旧经典】这些暖心内容呀？\n" +
+                    "（悄悄加个选项\uD83D\uDC49【祝福音乐】\uD83C\uDFB5，马上帮您找！）");
+        } else if (replyStaffId == 3) {
+            msgData.setTitle(String.format("很高兴认识您！我是%s，每天给您推荐精彩视频~", name));
+        } else {
+            msgData.setTitle("叔叔阿姨好，我是好看内容推荐官，每天会为您定制全网热点视频，感谢您的关注，手动转发支持哦~");
+        }
+        return msgData;
+    }
+
     private ReplyBucketData getPushMessageData(String userId, String videoIds) {
         log.info("strategyServiceMap={}", JSON.toJSONString(strategyServiceMap));
         for (Map.Entry<String, ReplyStrategyService> stringReplyStrategyServiceEntry : strategyServiceMap.entrySet()) {