Merge branch 'fixbug/fixApp' into 'master'

bug: [none] fixApp 小程序中不展示审核中应用

See merge request rays/pcloud-book!859

pcloud-service-book/src/main/java/com/pcloud/book/consumer/app/AppConsr.java

@@ -193,4 +193,23 @@ public class AppConsr {
 		}
 		return appPrices;
 	}
+
+	public Map<Long, AppDto> mapByIds4AuditPass(List<Long> appIds) {
+		LOGGER.info("获取应用基本信息过滤掉从来没有审核通过的[appService.mapByIds],参数列表[appIds]:" + appIds);
+		Map<Long, AppDto> appDtos = new HashMap<>();
+		if (ListUtils.isEmpty(appIds)) {
+			return appDtos;
+		}
+		try {
+			ResponseEntity<ResponseDto<Map<Long, AppDto>>> appDtosEntity = appService.mapByIds4AuditPass(appIds);
+			appDtos = ResponseHandleUtil.parseMapResponse(appDtosEntity, Long.class, AppDto.class);
+		} catch (BizException e) {
+			LOGGER.warn("获取应用基本信息[appService.mapByIds4AuditPass]:" + e.getMessage(), e);
+			throw new BizException(e.getCode(), e.getMessage());
+		} catch (Exception e) {
+			LOGGER.error("获取应用基本信息[appService.mapByIds4AuditPass]:" + e.getMessage(), e);
+			throw new BookBizException(BookBizException.INVOKE_USER_ERROR, "mapByIds4AuditPass获取应用基本信息失败~!");
+		}
+		return appDtos;
+	}
 }

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

@@ -991,7 +991,7 @@ public class GroupQrcodeBizImpl implements GroupQrcodeBiz {
     public ClassifyQrcodeVO getGroupQrcodeInfo(String groupQrCode, Long classifyId) {
         List<ClassifyQrcodeVO> qrcodeVOS = groupQrcodeDao.getQrcodeByClassifyId(classifyId);
         if (ListUtils.isEmpty(qrcodeVOS)){
-           return null;
+           return new ClassifyQrcodeVO();
         }
 
         for (ClassifyQrcodeVO qrcodeVO : qrcodeVOS) {

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

@@ -1317,7 +1317,7 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
             productDtoMap = productConsr.getProBasesByIds(productIds);
         }
         if (!ListUtils.isEmpty(appIds)) {
-            appDtoMap = appConsr.mapByIds(appIds);
+            appDtoMap = appConsr.mapByIds4AuditPass(appIds);
         }
         if (!ListUtils.isEmpty(groupIds)) {
             groupDtoMap = pcloudGroupActivityBiz.getByIds4Now(groupIds);
@@ -1376,6 +1376,8 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
                         accountSettingDto = qrcodeSceneConsr.getWechatInfo(appDto.getChannelId());
                         String resultLinkUrl = SendWeixinRequestTools.splitUrl(accountSettingDto, item.getLinkUrl());
                         item.setResultUrl(resultLinkUrl);
+                    } else {
+                        list_remove.add(item); //把要移除的统一放在一个集合
                     }
                 }
                 if (RightsServeTypeEnum.GROUP.name().equals(item.getServeType())) {