Merge branch 'fixbug/1024701' into 'master'

bug: [1024701] 点击已经被删除的群提示报错

See merge request rays/pcloud-book!857

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

@@ -990,6 +990,9 @@ public class GroupQrcodeBizImpl implements GroupQrcodeBiz {
     @Override
     public ClassifyQrcodeVO getGroupQrcodeInfo(String groupQrCode, Long classifyId) {
         List<ClassifyQrcodeVO> qrcodeVOS = groupQrcodeDao.getQrcodeByClassifyId(classifyId);
+        if (ListUtils.isEmpty(qrcodeVOS)){
+           return null;
+        }
 
         for (ClassifyQrcodeVO qrcodeVO : qrcodeVOS) {
             if (!StringUtil.isEmpty(groupQrCode) && qrcodeVO.getQrcodeUrl().equals(groupQrCode)){

pcloud-service-book/src/main/java/com/pcloud/book/rightsSetting/biz/impl/RightsSettingBizImpl.java

@@ -807,7 +807,9 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
             if (!MapUtils.isEmpty(nowItemMap)) {
                 // 填充应用、作品、社群、资讯
                 for (RightsSettingTitle rightsSettingTitle : rightsSettingTitles) {
-                    rightsSettingTitle.setRightsSettingItemList(nowItemMap.get(rightsSettingTitle.getId()));
+                    if (!ListUtils.isEmpty(nowItemMap.get(rightsSettingTitle.getId()))){ //add py pansy 删除的群不显示
+                        rightsSettingTitle.setRightsSettingItemList(nowItemMap.get(rightsSettingTitle.getId()));
+                    }
                 }
             }
             fillProductAndApp(nowItems);
@@ -1978,6 +1980,9 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
         }
         //移除不能购买的应用或作品
         removeCanNotBuy(nowItems);
+
+        fillProductAndApp(nowItems);
+
         for (RightsNowItem nowItem : nowItems) {
             if (itemType.value.equals(nowItem.getType())) {
                 items.add(nowItem);

pcloud-service-book/src/main/java/com/pcloud/book/skill/biz/impl/PcloudGroupActivityBizImpl.java

@@ -573,17 +573,19 @@ public class PcloudGroupActivityBizImpl implements PcloudGroupActivityBiz {
             String groupQrCode = groupQrcodeBiz.getChangeGroupQrCode(activity4AppletDTO.getClassifyId());
             // 通过群二维码链接反查群ID
 
-            if (activity4AppletDTO.getClassifyId() != null && activity4AppletDTO.getClassifyId() != 0){
+            if (activity4AppletDTO.getGroupType() == null|| activity4AppletDTO.getGroupType()!=1){
                 ClassifyQrcodeVO groupQrcodeInfo = groupQrcodeBiz
                         .getGroupQrcodeInfo(groupQrCode, activity4AppletDTO.getClassifyId());
 
                 //头像、对话
-                List<String> headUrlList = appletGroupSearchRecordBiz
-                        .getHeadUrlList(groupQrcodeInfo.getUserNumber(), groupQrcodeInfo.getId());
-                activity4AppletDTO.setHeadUrlList(headUrlList);
-                List<AppletGroupStatementDTO> statementDTOS = appletGroupSearchRecordBiz
-                        .getStatementList(groupQrcodeInfo.getUserNumber(), headUrlList, groupQrcodeInfo.getId());
-                activity4AppletDTO.setStatementDTOList(statementDTOS);
+                if(groupQrcodeInfo != null && groupQrcodeInfo.getId()!= null){
+                    List<String> headUrlList = appletGroupSearchRecordBiz
+                            .getHeadUrlList(groupQrcodeInfo.getUserNumber(), groupQrcodeInfo.getId());
+                    activity4AppletDTO.setHeadUrlList(headUrlList);
+                    List<AppletGroupStatementDTO> statementDTOS = appletGroupSearchRecordBiz
+                            .getStatementList(groupQrcodeInfo.getUserNumber(), headUrlList, groupQrcodeInfo.getId());
+                    activity4AppletDTO.setStatementDTOList(statementDTOS);
+                }
             }else{
                 //头像、对话
                 List<String> headUrlList = appletGroupSearchRecordBiz

pcloud-service-book/src/main/resources/mapper/skill/PcloudGroupActivityDao.xml

@@ -227,10 +227,11 @@
         FROM
         pcloud_group_activity a
         LEFT JOIN book_group_classify c ON a.book_group_classify_id = c.id AND c.is_delete = 0
-        LEFT JOIN book_group_qrcode b ON b.classify_id = c.id AND b.is_delete = 0
+        LEFT JOIN book_group_qrcode b ON b.classify_id = c.id
         LEFT JOIN book_group d ON c.book_group_id = d.id
         WHERE
-        a.is_delete = 0 AND a.is_show = 1
+        a.is_delete = 0 AND a.is_show = 1  AND IFNULL(b.is_delete,0) = 0
+        and !(c.id is null and a.group_type!=1)
         <if test="firstClassify != null">
             and a.first_classify = #{firstClassify}
         </if>
@@ -301,7 +302,7 @@
         LEFT JOIN pcloud_group_activity a ON a.book_group_classify_id = c.id
         LEFT JOIN book_group_qrcode b on b.classify_id = c.id
         where
-        b.is_delete = 0
+        IFNULL(b.is_delete,0) = 0
         and
         c.id IN
         <foreach collection="list" item="item" open="(" close=")" separator=",">
@@ -333,11 +334,12 @@
         'GROUP' as serveType
         FROM
         pcloud_group_activity a
-        left JOIN book_group_classify c ON a.book_group_classify_id = c.id AND c.is_delete = 0
-        left JOIN book_group_qrcode b on b.classify_id = c.id AND b.is_delete = 0
+        left JOIN book_group_classify c ON a.book_group_classify_id = c.id
+        left JOIN book_group_qrcode b on b.classify_id = c.id
         left JOIN book_group d ON c.book_group_id = d.id
         WHERE
-        a.is_delete = 0
+        a.is_delete = 0 AND IFNULL(b.is_delete,0) = 0
+        AND IFNULL(c.is_delete, 0) = 0
         <if test="isShow != null">
             AND a.is_show = #{isShow}
         </if>
@@ -401,9 +403,9 @@
         FROM
         pcloud_group_activity a
         INNER JOIN book_group_classify c ON a.book_group_classify_id = c.id AND c.is_delete = 0
-        INNER JOIN book_group_qrcode b on c.id = b.classify_id AND b.is_delete = 0
+        INNER JOIN book_group_qrcode b on c.id = b.classify_id
         WHERE
-        a.is_delete = 0 AND a.is_show = 1
+        a.is_delete = 0 AND a.is_show = 1 AND IFNULL(b.is_delete,0) = 0
         <if test="firstClassify != null">
             and a.first_classify = #{firstClassify}
         </if>
@@ -557,10 +559,11 @@
         FROM
         pcloud_group_activity a
         LEFT JOIN book_group_classify c ON a.book_group_classify_id = c.id AND c.is_delete = 0
-        LEFT JOIN book_group_qrcode b on c.id = b.classify_id AND b.is_delete = 0
+        LEFT JOIN book_group_qrcode b on c.id = b.classify_id
         LEFT JOIN book_group g ON g.id = c.book_group_id
         WHERE
-        a.is_delete = 0 AND a.is_show = 1
+        a.is_delete = 0 AND a.is_show = 1 AND IFNULL(b.is_delete,0) = 0
+        and !(c.id is null and a.group_type!=1)
         <if test="firstClassify != null">
             and a.first_classify = #{firstClassify}
         </if>
@@ -600,10 +603,10 @@
   FROM
   pcloud_group_activity a
   INNER JOIN book_group_classify c ON a.book_group_classify_id = c.id AND c.is_delete = 0
-  INNER JOIN book_group_qrcode b on c.id = b.classify_id AND b.is_delete = 0
+  INNER JOIN book_group_qrcode b on c.id = b.classify_id
   LEFT JOIN book_group g ON g.id = c.book_group_id
   WHERE
-  a.is_delete = 0 AND a.is_show = 1
+  a.is_delete = 0 AND a.is_show = 1 AND IFNULL(b.is_delete,0) = 0
   and c.city_code = #{cityCode}
   and a.group_type != 1
   GROUP BY a.id