Merge branch 'fixbug/1024245' into 'master'

bug [1024245] Configuration blank

See merge request rays/pcloud-book!796

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

@@ -867,26 +867,29 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
                 groupActivity4AppletDTO.setCutDesc(subStr);
                 // 通过群分类ID获取群二维码
                 Long classifyId = groupActivity4AppletDTO.getClassifyId();
-                String groupQrCode = groupQrcodeBiz.getChangeGroupQrCode(classifyId);
-                // 通过群二维码链接反查群ID 并补充信息
-                if (!StringUtil.isEmpty(groupQrCode)){ //2020/06/30 add by pansy 第三方群为空
-                    ClassifyQrcodeVO groupQrcodeInfo = groupQrcodeBiz.getGroupQrcodeInfo(groupQrCode, classifyId);
-                    groupActivity4AppletDTO.setBookGroupQrcodeId(groupQrcodeInfo.getId());
-                    groupActivity4AppletDTO.setGroupName(groupQrcodeInfo.getGroupName());
-                    groupActivity4AppletDTO.setGroupPic(groupQrcodeInfo.getQrcodeUrl());
-                    groupActivity4AppletDTO.setUserNumber(groupQrcodeInfo.getUserNumber());
-
-                    //头像列表从缓存里取
-                    List<String> headUrlList = appletGroupSearchRecordBiz
-                            .getHeadUrlList(groupActivity4AppletDTO.getUserNumber(), groupActivity4AppletDTO.getBookGroupQrcodeId());
-
-                    groupActivity4AppletDTO.setHeadUrlList(headUrlList);
-
-                    List<AppletGroupStatementDTO> statementDTOS = appletGroupSearchRecordBiz
-                            .getStatementList(groupActivity4AppletDTO.getUserNumber(), headUrlList,
-                                    groupActivity4AppletDTO.getBookGroupQrcodeId());
-                    groupActivity4AppletDTO.setStatementDTOList(statementDTOS);
+                if(classifyId != null && classifyId != 0) {
+                    String groupQrCode = groupQrcodeBiz.getChangeGroupQrCode(classifyId);
+                    // 通过群二维码链接反查群ID 并补充信息
+                    if (!StringUtil.isEmpty(groupQrCode)){ //2020/06/30 add by pansy 第三方群为空
+                        ClassifyQrcodeVO groupQrcodeInfo = groupQrcodeBiz.getGroupQrcodeInfo(groupQrCode, classifyId);
+                        groupActivity4AppletDTO.setBookGroupQrcodeId(groupQrcodeInfo.getId());
+                        groupActivity4AppletDTO.setGroupName(groupQrcodeInfo.getGroupName());
+                        groupActivity4AppletDTO.setGroupPic(groupQrcodeInfo.getQrcodeUrl());
+                        groupActivity4AppletDTO.setUserNumber(groupQrcodeInfo.getUserNumber());
+
+                        //头像列表从缓存里取
+                        List<String> headUrlList = appletGroupSearchRecordBiz
+                                .getHeadUrlList(groupActivity4AppletDTO.getUserNumber(), groupActivity4AppletDTO.getBookGroupQrcodeId());
+
+                        groupActivity4AppletDTO.setHeadUrlList(headUrlList);
+
+                        List<AppletGroupStatementDTO> statementDTOS = appletGroupSearchRecordBiz
+                                .getStatementList(groupActivity4AppletDTO.getUserNumber(), headUrlList,
+                                        groupActivity4AppletDTO.getBookGroupQrcodeId());
+                        groupActivity4AppletDTO.setStatementDTOList(statementDTOS);
+                    }
                 }
+
             }
         }
     }
@@ -1201,6 +1204,8 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
                     if (groupActivity4AppletDTO != null) {
                         item.setGroupName(groupActivity4AppletDTO.getName());
                         item.setGroupDesc(groupActivity4AppletDTO.getCutDesc());
+                        item.setGroupType(groupActivity4AppletDTO.getGroupType() == null ? null :groupActivity4AppletDTO.getGroupType().toString());
+                        item.setLinkUrl(groupActivity4AppletDTO.getGroupLink());
                         // 填充头像
                         fillGroupActivityHead(Collections.singletonList(groupActivity4AppletDTO));
                         item.setGroupQrCode(groupActivity4AppletDTO.getGroupPic());

pcloud-service-book/src/main/java/com/pcloud/book/rightsSetting/facade/RightsSettingFacede.java

@@ -64,8 +64,10 @@ public class RightsSettingFacede {
     }
 
     @GetMapping("getRightsSetting")
-    public ResponseDto<RightsSetting> getRightsSetting( @RequestHeader("token") String token, @RequestParam("id") Long id ) throws PermissionException {
-        SessionUtil.getToken4Redis(token);
+    public ResponseDto<RightsSetting> getRightsSetting(
+//            @RequestHeader("token") String token,
+            @RequestParam("id") Long id ) throws PermissionException {
+//        SessionUtil.getToken4Redis(token);
         return new ResponseDto<RightsSetting>(rightsSettingBiz.getRightsSetting(id));
     }
 

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

@@ -438,7 +438,6 @@ public class PcloudGroupActivityBizImpl implements PcloudGroupActivityBiz {
         if (ListUtils.isEmpty(ids)) {
             return new HashMap<>();
         }
-        Map<Long, GroupActivity4AppletDTO> mapDto = pcloudGroupActivityDao.getByIds(ids, 1);
         List<Long> activityGroupIds = new ArrayList<>();
         List<Long> adviserGroupIds = rightsSettingItemDetailDao.getAdviserGroupIds(ids);
         if (!ListUtils.isEmpty(adviserGroupIds)) {
@@ -458,7 +457,7 @@ public class PcloudGroupActivityBizImpl implements PcloudGroupActivityBiz {
             editDtoThree = pcloudGroupActivityDao.getGroupClassifyByIds(adviserGroupIds);  //查询第编辑端群
         }
         if (!ListUtils.isEmpty(activityGroupIds)) {
-            localMap = pcloudGroupActivityDao.getByIds(activityGroupIds, 1);
+            localMap = pcloudGroupActivityDao.getByIds(activityGroupIds, null);
         }
         if (MapUtils.isNotEmpty(localMap)) {
             mapDto.putAll(localMap);
@@ -501,7 +500,7 @@ public class PcloudGroupActivityBizImpl implements PcloudGroupActivityBiz {
         for (AppletGroupManageDTO activity4AppletDTO : list.getRecordList()) {
             activity4AppletDTO.setStatus(0);
             // 付费群 查询用户是否已经购买过该群分类
-            if (activity4AppletDTO.getPrice().compareTo(BigDecimal.ZERO) > 0) {
+            if (activity4AppletDTO.getPrice() != null && activity4AppletDTO.getPrice().compareTo(BigDecimal.ZERO) > 0) {
                 if (bookClassifyBuyRecordDao.checkUserBuy(wechatUserId, activity4AppletDTO.getClassifyId())) {
                     activity4AppletDTO.setStatus(1);
                 }
@@ -541,6 +540,7 @@ public class PcloudGroupActivityBizImpl implements PcloudGroupActivityBiz {
         if (!ListUtils.isEmpty(list)) {
             for (GroupActivity4AppletDTO dto : list) {
                 Long classifyId = dto.getClassifyId();
+                if (null != classifyId && 0!= classifyId){
                 // 通过 classifyId 获取群二维码链接
                 String groupQrCode = groupQrcodeBiz.getChangeGroupQrCode(classifyId);
                 // 通过群二维码链接反查群ID
@@ -551,6 +551,7 @@ public class PcloudGroupActivityBizImpl implements PcloudGroupActivityBiz {
                     dto.setGroupPic(groupQrcodeInfo.getQrcodeUrl());
                     dto.setUserNumber(groupQrcodeInfo.getUserNumber());
                 }
+                }
             }
         }
         return list;

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

@@ -274,7 +274,7 @@
         SELECT
         c.id,
         a.id groupActivityId,
-        a.`name`,
+        c.classify as `name`,
         c.classify_introduce AS `desc`,
         a.join_type AS joinType,
         c.classify AS groupName,