Merge branch 'feat-zyjmaster' into 'master'

猜谜语-关键词

See merge request rays/pcloud-book!93

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

@@ -283,7 +283,7 @@ public class BookGuideBizImpl implements BookGuideBiz {
         }
         //获取关键词信息（改成10个了）
         SendWeixinRequestTools.sendKeywordsInfo(keywords, robotId, weixinGroupId, pushAddUserMessageDTO.getIp());
-        //如果设置了群学习报告，加一个群学习报告的关键词
+        //如果设置了群学习报告，加一个群学习报告的关键词，如果群开启了猜谜语，推送猜谜语关键词
         pushLearningReport(classifyQrcodeInfo,robotId, weixinGroupId, pushAddUserMessageDTO.getIp());
         if (bookGuide != null && bookGuide.getIsRecommend() != null && bookGuide.getIsRecommend() == 1) {
             //推送公众号消息
@@ -316,10 +316,24 @@ public class BookGuideBizImpl implements BookGuideBiz {
         }
     }
 
-    @ParamLog("推关学习报告键词消息")
+    @ParamLog("推关学习报告/猜谜语关键词消息")
     private void pushLearningReport(GroupClassifyQrcodeDTO classifyQrcodeInfo, String robotId, String weixinGroupId, String ip) {
+        Boolean reportOpen = false;
+        Boolean riddleOpen = false;
         if (classifyQrcodeInfo.getHasOpenLearningReport() != null && classifyQrcodeInfo.getHasOpenLearningReport()) {
+            reportOpen = true;
+        }
+        GroupQrcode groupQrcode = groupQrcodeDao.getGroupQrcodeByGroupId(weixinGroupId);
+        if (null != groupQrcode && groupQrcode.getRiddleOpen()) {
+            riddleOpen = true;
+        }
+        if (reportOpen && riddleOpen) {
+            SendWeixinRequestTools.sendTextMessage("关键词【学习报告】\n    获取个人专属学习报告，与群成员PK元气值\n" +
+                    "关键词【猜谜语】\n    猜谜语，大家一起玩，看谁666", robotId, weixinGroupId, ip);
+        } else if (reportOpen) {
             SendWeixinRequestTools.sendTextMessage("关键词【学习报告】\n    获取个人专属学习报告，与群成员PK元气值", robotId, weixinGroupId, ip);
+        } else if (riddleOpen) {
+            SendWeixinRequestTools.sendTextMessage("关键词【猜谜语】\n    猜谜语，大家一起玩，看谁666", robotId, weixinGroupId, ip);
         }
     }
 

pcloud-service-book/src/main/java/com/pcloud/book/riddle/biz/impl/RiddleRecordBizImpl.java

@@ -119,7 +119,7 @@ public class RiddleRecordBizImpl implements RiddleRecordBiz {
         //2猜谜语进行中
         else if (null != riddleRecord && !RiddleRecordStatusEnum.end.getCode().equals(riddleRecord.getStatus())) {
             //2.1是关键词,不处理
-           /* Boolean keyWord = false;
+            /*Boolean keyWord = false;
             GroupClassifyQrcodeDTO classifyQrcodeInfo = bookGroupClassifyBiz.getClassifyQrcodeInfo(wxGroupId);
             if (null != classifyQrcodeInfo) {
                 ReplyKeywordDTO replyKeywordDTO = bookKeywordDao.getKeywordId(classifyQrcodeInfo.getClassifyId(), classifyQrcodeInfo.getBookGroupId(), textContent);
@@ -264,9 +264,9 @@ public class RiddleRecordBizImpl implements RiddleRecordBiz {
         String reply = getRandomReply(RiddleReplyTypeEnum.rule.getCode());
         Integer correctCount = riddleRecordDao.getCorrectCountByGroup(wxGroupId, finishCount);
         if (null != currentRiddle) {
-            reply = reply + "\n" + "目前处于第" + currentRiddle.getGrade() + "关,已猜对" + correctCount + "题,大家加油。";
+            reply = reply + "\n" + "目前处于第" + currentRiddle.getGrade() + "关，已猜对" + correctCount + "题，大家加油。";
         } else {
-            reply = reply + "\n" + "目前处于第1关,已猜对0题,大家加油。";
+            reply = reply + "\n" + "目前处于第1关，已猜对0题，大家加油。";
         }
         sendWeixinTextMessage(wxId, wxGroupId, reply, ip, null);
         //发送题目，保存该题目

pcloud-service-book/src/main/resources/mapper/group/GroupQrcode.Mapper.xml

@@ -517,10 +517,9 @@
         LEFT JOIN book_group_classify c ON q.classify_id = c.id
         LEFT JOIN book_group g ON c.book_group_id = g.id
         LEFT JOIN book b ON g.book_id = b.BOOK_ID
-        LEFT JOIN book_adviser a ON g.book_id = a.BOOK_ID
         WHERE
-        a.ADVISER_ID = #{partyId}
-        AND a.IS_DELETE = 0
+        q.create_user = #{partyId}
+        AND b.IS_DELETE = 0
         AND g.is_delete = 0
         AND c.is_delete = 0
         AND q.is_delete = 0
@@ -532,6 +531,7 @@
             OR b.BOOK_NAME LIKE CONCAT('%', #{name}, '%')
             )
         </if>
+        ORDER BY q.id DESC
     </select>
 
     <update id="updateRiddleOpenStatus" parameterType="map">