Merge branch 'mymaster' into 'master'

修复统计bug

See merge request rays/pcloud-book!18

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

@@ -558,6 +558,7 @@ public class BookGroupBizImpl implements BookGroupBiz {
         wechatGroupDtoA.setIds(appIds);
         wechatGroupDtoA.setPartyId(partyId);
         wechatGroupDtoA.setType("APP");
+        wechatGroupDtoA.setQrcodeId(qrcodeId);
         Map<Long, GroupMoneyDto> productSaleMap = tradeConsr.getQrGroupSaleMoney(wechatGroupDtoP);
         Map<Long, GroupMoneyDto> appSaleMap = tradeConsr.getQrGroupSaleMoney(wechatGroupDtoA);
         for (AppStatisticsDTO appStatisticsDTO : appStatisticsDTOS) {

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

@@ -318,6 +318,12 @@ public class BookKeywordBizImpl implements BookKeywordBiz {
         PageParam pageParam = new PageParam(currentPage, numPerPage);
         Map<String, Object> map = new HashMap<>();
         map.put("bookGroupId", bookGroupId);
+        if (!StringUtil.isEmpty(weixinGroupId)) {
+            GroupQrcode groupQrcode = groupQrcodeDao.getGroupQrcodeByGroupId(weixinGroupId);
+            if (groupQrcode != null) {
+                map.put("classifyId", groupQrcode.getClassifyId());
+            }
+        }
         //分页获取关键词，创建时间，名称信息
         PageBeanNew<KeywordStatisticsDTO> pageBeanNew = bookKeywordDao.listPageNew(pageParam, map, "getKeywordInfoByBookGroupId");
         List<KeywordStatisticsDTO> keywordStatisticsDTOS = pageBeanNew.getRecordList();

pcloud-service-book/src/main/resources/mapper/keywords/BookKeyword.Mapper.xml

@@ -224,6 +224,9 @@
         WHERE
         t.is_delete = 0
         AND t.book_group_id = #{bookGroupId}
+        <if test="classifyId!=null">
+            AND t.classify_id=#{classifyId}
+        </if>
         order by t.create_time desc
     </select>
 </mapper>
\ No newline at end of file