修改pdf阅读权限

app/resource/src/main/java/com/zrqx/resource/bg/service/ebook/EbookServiceImpl.java

@@ -408,49 +408,43 @@ public class EbookServiceImpl extends BaseServiceImpl<Ebook, String> implements
 			Ebook ebook = ebookMapper.selectPdf(param.getPdfId());
 			//收费
 			if (ebook.getPriceOption().equals(1)){
-				//登录
-				if (StringUtils.isNotBlank(redis.get(param.getUserId().substring(3,35)))){
-					//获取用户类型
-					OrderinfoIdVo level = ebookMapper.getUserDiy(redis.getMember().getId()+"");
-					//普通用户或会员用户
-					Integer idVo = ebookMapper.getPersonal(redis.getMember().getId()+"");
-					if (0 == level.getLevel()){
-						//普通会员
-						if (0 == idVo){
-							// 普通会员，判断是否购买该课程
-							GoodsForm goodsForm = new GoodsForm();
-							goodsForm.setId(ebook.getId());
-							goodsForm.setType(AllResourceTypeEnum.BOOK.getCode().toString());
-							CallBack<Boolean> result = fgOrderClient.isExistBuyGoods(goodsForm);
-							if (result.hasEntity()&& result.getData()){
-								vo.setLevel("2");
-							}else {
-								vo.setLevel("1");
-							}
-						}else {
-							//会员用户
+				//获取用户类型
+				OrderinfoIdVo level = ebookMapper.getUserDiy(redis.getMember().getId()+"");
+				//普通用户或会员用户
+				Integer idVo = ebookMapper.getPersonal(redis.getMember().getId()+"");
+				if (0 == level.getLevel()){
+					//普通会员
+					if (0 == idVo){
+						// 普通会员，判断是否购买该课程
+						GoodsForm goodsForm = new GoodsForm();
+						goodsForm.setId(ebook.getId());
+						goodsForm.setType(AllResourceTypeEnum.BOOK.getCode().toString());
+						CallBack<Boolean> result = fgOrderClient.isExistBuyGoods(goodsForm);
+						if (result.hasEntity()&& result.getData()){
 							vo.setLevel("2");
+						}else {
+							vo.setLevel("1");
 						}
 					}else {
-						Integer oid = ebookMapper.getOrganMember(level.getId());
-						//机构用户
-						CallBack<String> member = organClient.getCurrentOrganByMember(oid);
-						String[] split = member.getData().split(",");
-						//查询图书分类
-						EbookDiyType diyType = new EbookDiyType();
-						diyType.setEbookId(ebook.getId());
-						List<EbookDiyType> list = ebookDiyTypeMapper.select(diyType);
-						for (String str : split){
-							boolean isExist = list.stream().anyMatch(s -> s.getCode().indexOf(str) == 0);
-							if (isExist){
-								vo.setLevel("2");
-								return vo;
-							}
+						//会员用户
+						vo.setLevel("2");
+					}
+				}else {
+					Integer oid = ebookMapper.getOrganMember(level.getId());
+					//机构用户
+					CallBack<String> member = organClient.getCurrentOrganByMember(oid);
+					String[] split = member.getData().split(",");
+					//查询图书分类
+					EbookDiyType diyType = new EbookDiyType();
+					diyType.setEbookId(ebook.getId());
+					List<EbookDiyType> list = ebookDiyTypeMapper.select(diyType);
+					for (String str : split){
+						boolean isExist = list.stream().anyMatch(s -> s.getCode().indexOf(str) == 0);
+						if (isExist){
+							vo.setLevel("2");
+							return vo;
 						}
-						vo.setLevel("1");
 					}
-				}else{
-					//未登录
 					vo.setLevel("1");
 				}
 			}else {