合并代码

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

@@ -58,7 +58,7 @@ public interface GroupQrcodeBiz {
      * @Desr:新增一个用户
      * @Date:2019/4/28 14:45
      */
-    void addOneUser(String wechatGroupId, Integer memberCount);
+    void addOneUser(String wechatGroupId, Integer memberCount, String nickName);
 
     /**
      * @Author:lili

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

@@ -21,6 +21,7 @@ import com.pcloud.book.group.vo.ClassifyQrcodeVO;
 import com.pcloud.book.group.vo.ClassifyVO;
 import com.pcloud.book.group.vo.GroupQrcodeBaseInfoVO;
 import com.pcloud.book.group.vo.ListQrcodeByClassifyParamVO;
+import com.pcloud.book.keywords.biz.BookGuideBiz;
 import com.pcloud.book.keywords.dao.BookKeywordRecordDao;
 import com.pcloud.book.keywords.dto.KeywordUserCountDTO;
 import com.pcloud.book.mq.producer.BookMQProducer;
@@ -65,6 +66,8 @@ public class GroupQrcodeBizImpl implements GroupQrcodeBiz {
     private BookKeywordRecordDao bookKeywordRecordDao;
     @Autowired
     private ReaderConsr readerConsr;
+    @Autowired
+    private BookGuideBiz bookGuideBiz;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -162,7 +165,7 @@ public class GroupQrcodeBizImpl implements GroupQrcodeBiz {
 
     @Override
     @ParamLog("新增一个用户")
-    public void addOneUser(String weixinGroupId, Integer memberCount) {
+    public void addOneUser(String weixinGroupId, Integer memberCount, String nickName) {
         String robotIdByGroupId = wechatGroupConsr.getRobotIdByGroupId(weixinGroupId);
         Integer peopleCounts = WxGroupSDK.getPeopleCounts(weixinGroupId, robotIdByGroupId);
         if (peopleCounts != null) {
@@ -184,6 +187,12 @@ public class GroupQrcodeBizImpl implements GroupQrcodeBiz {
             //将二维码修改为已满群状态
             changeToOverNumber(groupQrcodeDTO.getWeixinQrcodeId(), groupQrcodeDTO.getId());
         }
+        List<String> nickNames = JedisClusterUtils.getJsonList("BOOK:WEIXINGROUP:GUIDEUSER" + weixinGroupId, String.class);
+        if(ListUtils.isEmpty(nickNames) && !StringUtil.isEmpty(nickName)){
+            nickNames = new ArrayList<>();
+            nickNames.add(nickName);
+            JedisClusterUtils.setJsonList("BOOK:WEIXINGROUP:GUIDEUSER" + weixinGroupId, nickNames, 600);
+        }
         String value = JedisClusterUtils.getJson("BOOK:WEIXINGROUP:GUIDE" + weixinGroupId, String.class);
         if (StringUtil.isEmpty(value)) {
             JedisClusterUtils.setJson("BOOK:WEIXINGROUP:GUIDE" + weixinGroupId, weixinGroupId, 5);

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

@@ -12,6 +12,7 @@ import com.pcloud.channelcenter.wechat.dto.AccountSettingDto;
 import com.pcloud.common.core.aspect.ParamLog;
 import com.pcloud.common.utils.BeanUtils;
 import com.pcloud.common.utils.ListUtils;
+import com.pcloud.common.utils.cache.redis.JedisClusterUtils;
 import com.pcloud.common.utils.string.StringUtil;
 import com.sdk.wxgroup.ChangeNameVO;
 import com.sdk.wxgroup.QrcodeVO;
@@ -145,6 +146,7 @@ public class SendWeixinRequestTools {
 
     @ParamLog("修改微信群名称")
     public static void sendGuideMessage(List<ReplyMessageVO> replyMessages, String robotId, String weixinGroupId) {
+        JedisClusterUtils.del("BOOK:WEIXINGROUP:GUIDEUSER" + weixinGroupId);
         if (ListUtils.isEmpty(replyMessages)) {
             return;
         }
@@ -282,10 +284,17 @@ public class SendWeixinRequestTools {
 
     public static void sendDefaultMessage(String groupName, String robotId, String weixinGroupId) {
         String content = "";
+        List<String> nickNames = JedisClusterUtils.getJsonList("BOOK:WEIXINGROUP:GUIDEUSER" + weixinGroupId, String.class);
+        if(!ListUtils.isEmpty(nickNames)){
+            JedisClusterUtils.del("BOOK:WEIXINGROUP:GUIDEUSER" + weixinGroupId);
+        }
+        for (String nickName : nickNames) {
+            content = content + "@" + nickName + " ";
+        }
         if (StringUtil.isEmpty(groupName)) {
-            content = "欢迎加入本群，凭以下关键词领取任务或资源：";
+            content = content + "欢迎加入本书!凭以下关键词领取任务或资源：";
         } else {
-            content = "欢迎加入" + groupName + "！凭以下关键词领取任务或资源：";
+            content = content + "欢迎加入本书!" + groupName + "凭以下关键词领取任务或资源：";
         }
         SendTextMessageVO sendTextMessageVO = new SendTextMessageVO();
         sendTextMessageVO.setContent(content);

pcloud-service-book/src/main/java/com/pcloud/book/keywords/biz/impl/BookKeywordBizImpl.java

@@ -185,9 +185,9 @@ public class BookKeywordBizImpl implements BookKeywordBiz {
     @ParamLog("获取5个关键词")
     public List<KeywordDTO> listFiveKeyword(Long classifyId, Long bookGroupId) {
         //获取是否单独设置关键词
-        List<KeywordDTO> keywords = bookKeywordDao.listFiveKeyword(0L, bookGroupId);
+        List<KeywordDTO> keywords = bookKeywordDao.listFiveKeyword(classifyId, bookGroupId);
         if (ListUtils.isEmpty(keywords)) {
-            keywords = bookKeywordDao.listFiveKeyword(classifyId, bookGroupId);
+            keywords = bookKeywordDao.listFiveKeyword(0L, bookGroupId);
         }
         return keywords;
     }

pcloud-service-book/src/main/java/com/pcloud/book/mq/topic/AddWxGroupListener.java

@@ -31,7 +31,7 @@ public class AddWxGroupListener {
         try {
             if (addWXGroupDTO == null || addWXGroupDTO.getWechatGroupId() == null || addWXGroupDTO.getMemberCount() == null)
                 return;
-            groupQrcodeBiz.addOneUser(addWXGroupDTO.getWechatGroupId(), addWXGroupDTO.getMemberCount());
+            groupQrcodeBiz.addOneUser(addWXGroupDTO.getWechatGroupId(), addWXGroupDTO.getMemberCount(),addWXGroupDTO.getNickName());
         } catch (Exception e) {
             LOGGER.error("接收微信用户进群消息失败" + e.getMessage(), e);
         }