发送主打资源

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

@@ -25,10 +25,13 @@ import com.pcloud.book.keywords.biz.BookGuideBiz;
 import com.pcloud.book.keywords.biz.BookKeywordBiz;
 import com.pcloud.book.keywords.dao.BookGuideDao;
 import com.pcloud.book.keywords.dao.BookGuideReplyDao;
+import com.pcloud.book.keywords.dao.KeywordDao;
 import com.pcloud.book.keywords.dto.GuideDTO;
 import com.pcloud.book.keywords.dto.KeywordDTO;
+import com.pcloud.book.keywords.dto.ReplyKeywordDTO;
 import com.pcloud.book.keywords.entity.BookGuide;
 import com.pcloud.book.keywords.entity.BookGuideReply;
+import com.pcloud.book.keywords.entity.Keyword;
 import com.pcloud.book.keywords.enums.ReplyTypeEnum;
 import com.pcloud.book.keywords.vo.GuideVO;
 import com.pcloud.book.keywords.vo.ReplyMessageVO;
@@ -96,6 +99,8 @@ public class BookGuideBizImpl implements BookGuideBiz {
     private BookGroupClassifyDao bookGroupClassifyDao;
     @Autowired
     private JoinGroupCipherDao joinGroupCipherDao;
+    @Autowired
+    private KeywordDao keywordDao;
 
     @ParamLog("同意加好友发送欢迎语")
     @Override
@@ -128,6 +133,9 @@ public class BookGuideBizImpl implements BookGuideBiz {
             // 如果不是第一次就发关键词
             // 根据暗号获取分类id和bookGroupId推送关键词欢迎语
             List<KeywordDTO> keywords = bookKeywordBiz.listFiveKeyword(dto.getClassifyId(), dto.getBookGroupId());
+            //发主打资源
+            sendMainKeyword(keywords,agreeAddUserDTO,dto);
+            //发关键词列表
             SendWeixinRequestTools.sendKeywordsInfo(keywords, agreeAddUserDTO.getRobotWxId(), agreeAddUserDTO.getUserWxId(), agreeAddUserDTO.getIp());
         }
         // 拉群
@@ -169,6 +177,25 @@ public class BookGuideBizImpl implements BookGuideBiz {
         }
     }
 
+    @ParamLog("发送主打资源")
+    private void sendMainKeyword(List<KeywordDTO> keywords, AgreeAddUserDTO agreeAddUserDTO, JoinGroupCipherDTO dto) {
+        if (!ListUtils.isEmpty(keywords)) {
+            KeywordDTO keywordDTO = keywords.get(0);
+            Keyword keyword = keywordDao.getById(keywordDTO.getKeywordId());
+            if (keyword != null) {
+                ReplyKeywordDTO replyKeywordDTO = new ReplyKeywordDTO();
+                BeanUtils.copyProperties(keyword, replyKeywordDTO);
+                if (ReplyTypeEnum.APP.value.equals(replyKeywordDTO.getReplyType()) || ReplyTypeEnum.LINK.value.equals(replyKeywordDTO.getReplyType())) {
+                    BookGroupDTO bookGroupDTO = bookGroupDao.getDTOById(dto.getBookGroupId());
+                    AccountSettingDto accountSettingDto = qrcodeSceneConsr.getWechatInfo(bookGroupDTO.getChannelId());
+                    String linkUrl = SendWeixinRequestTools.splitUrlNew(accountSettingDto, replyKeywordDTO.getLinkUrl(), dto.getBookGroupId(), dto.getClassifyId(), dto.getQrcodeId());
+                    replyKeywordDTO.setLinkUrl(linkUrl);
+                }
+                SendWeixinRequestTools.sendKeywordMessage(replyKeywordDTO, agreeAddUserDTO.getRobotWxId(), agreeAddUserDTO.getRobotWxId(), agreeAddUserDTO.getIp(), SendMessageTypeEnum.SELF.getCode());
+            }
+        }
+    }
+
     @Override
     @ParamLog("新增欢迎语")
     @Transactional(rollbackFor = Exception.class)

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

@@ -518,7 +518,7 @@ public class BookKeywordBizImpl implements BookKeywordBiz {
                 } else if (ReplyTypeEnum.TEXT.value.equals(dto.getReplyType())){
                     sb.append(dto.getKeywords()).append(":").append(dto.getContent()).append("\n");
                 } else if (ReplyTypeEnum.IMAGE.value.equals(dto.getReplyType())) {
-                    SendWeixinRequestTools.sendKeywordMessage(d, robotId, altId, ip, code);
+                    SendWeixinRequestTools.sendKeywordMessage(dto, robotId, altId, ip, code);
                     continue;
                 }
             }