fix bug

pcloud-service-book/src/main/java/com/pcloud/book/group/biz/impl/GroupQrcodeBizImpl.java

@@ -189,12 +189,11 @@ public class GroupQrcodeBizImpl implements GroupQrcodeBiz {
         if(nickNames==null){
             nickNames = new HashMap<>();
             nickNames.put(nickName,0);
-            JedisClusterUtils.setJson("BOOK:WEIXINGROUP:GUIDEUSER" + weixinGroupId, nickNames, 600);
         }else{
             nickNames.put(nickName,0);
-            JedisClusterUtils.setJson("BOOK:WEIXINGROUP:GUIDEUSER" + weixinGroupId, nickNames, 600);
         }
-
+        LOGGER.info("新用户"+nickNames);
+        JedisClusterUtils.setJson("BOOK:WEIXINGROUP:GUIDEUSER" + weixinGroupId, nickNames, 600);
 
         String value = JedisClusterUtils.getJson("BOOK:WEIXINGROUP:GUIDE" + weixinGroupId, String.class);
 

pcloud-service-book/src/main/java/com/pcloud/book/group/tools/SendWeixinRequestTools.java

@@ -149,32 +149,42 @@ public class SendWeixinRequestTools {
         if (ListUtils.isEmpty(replyMessages)) {
             return;
         }
+        int i = 0;
         for (ReplyMessageVO replyMessageVO : replyMessages) {
             SendMessageDTO sendMessageDTO = new SendMessageDTO();
             BeanUtils.copyProperties(replyMessageVO, sendMessageDTO);
+            String nickNameStr = getNickNameStr(weixinGroupId);
+            if(i==0) {
+                LOGGER.info("发送欢迎语" + nickNameStr);
+                if (StringUtils.isNotEmpty(nickNameStr)) {
+                    if (ReplyTypeEnum.TEXT.value.equals(sendMessageDTO.getReplyType())) {
+                        sendMessageDTO.setContent(nickNameStr + " " + sendMessageDTO.getContent());
+                    } else {
+                        sendAtMessage(nickNameStr, robotId, weixinGroupId);
+                    }
+                }
+            }
             sendMessage(sendMessageDTO, robotId, weixinGroupId);
+            i++;
         }
     }
 
 
     @ParamLog("推送消息")
     private static void sendMessage(SendMessageDTO sendMessageDTO, String robotId, String weixinGroupId) {
-        String nickNameStr = getNickNameStr(weixinGroupId);
         if (ReplyTypeEnum.TEXT.value.equals(sendMessageDTO.getReplyType())) {
             SendTextMessageVO sendTextMessageVO = new SendTextMessageVO();
-            sendTextMessageVO.setContent(nickNameStr+" "+sendMessageDTO.getContent());
+            sendTextMessageVO.setContent(sendMessageDTO.getContent());
             sendTextMessageVO.setAltId(robotId);
             sendTextMessageVO.setGroupId(weixinGroupId);
             WxGroupSDK.sendTextMessage(sendTextMessageVO);
         } else if (ReplyTypeEnum.IMAGE.value.equals(sendMessageDTO.getReplyType())) {
-            sendAtMessage(nickNameStr,robotId,weixinGroupId);
             SendPicMessageVO sendPicMessageVO = new SendPicMessageVO();
             sendPicMessageVO.setGroupId(weixinGroupId);
             sendPicMessageVO.setAltId(robotId);
             sendPicMessageVO.setPicUrl(sendMessageDTO.getPicUrl());
             WxGroupSDK.sendPicMessage(sendPicMessageVO);
         } else if (ReplyTypeEnum.APP.value.equals(sendMessageDTO.getReplyType()) || ReplyTypeEnum.LINK.value.equals(sendMessageDTO.getReplyType())) {
-            sendAtMessage(nickNameStr,robotId,weixinGroupId);
             SendArticleMessageVO sendArticleMessageVO = new SendArticleMessageVO();
             sendArticleMessageVO.setAltId(robotId);
             sendArticleMessageVO.setDescription(sendMessageDTO.getDescription());
@@ -296,11 +306,10 @@ public class SendWeixinRequestTools {
 
     public static void sendDefaultMessage(String groupName, String robotId, String weixinGroupId) {
         String content = getNickNameStr(weixinGroupId);
-
         if (StringUtil.isEmpty(groupName)) {
-            content += ",欢迎加入本群，凭以下关键词领取任务或资源：";
+            content += " 欢迎加入本群，凭以下关键词领取任务或资源：";
         } else {
-            content += ",欢迎加入" + groupName + "！凭以下关键词领取任务或资源：";
+            content += " 欢迎加入" + groupName + "！凭以下关键词领取任务或资源：";
         }
         SendTextMessageVO sendTextMessageVO = new SendTextMessageVO();
         sendTextMessageVO.setContent(content);
@@ -322,10 +331,6 @@ public class SendWeixinRequestTools {
             }
             Map.Entry<String, Integer> entry =  iterator.next();
             String key=entry.getKey();
-            Integer value=entry.getValue();
-            if(value==1){
-                continue;
-            }
             names.add(key);
             i++;
         }
@@ -333,7 +338,7 @@ public class SendWeixinRequestTools {
             nickNames.remove(nickName);
             nameStr = nameStr + "@" + nickName + "  ";
         }
-        JedisClusterUtils.setJson("BOOK:WEIXINGROUP:GUIDEUSER" + weixinGroupId,nickNames);
+        JedisClusterUtils.setJson("BOOK:WEIXINGROUP:GUIDEUSER" + weixinGroupId,nickNames,600);
         return nameStr;
     }
 }