--no commit message

app/resource/src/main/java/com/zrqx/resource/fg/service/ebook/FgEbookServiceImpl.java

@@ -305,20 +305,20 @@ public class FgEbookServiceImpl extends BaseServiceImpl<Ebook, String> implement
 		record.setGoodsType(vo.getGoodsType());
 		Integer readerNum = recordMapper.selectCount(record);
 		vo.setReaderNum(readerNum);*/
-		if (!redis.isExistMember()) {
-			// 未登录
-			vo.setXmlFile(null);
-			vo.setIsStatus(ReadOrShoppingCartTypeEnum.STATUS_1.getCode());
-			vo.setMessage(EbookPromptMessageEnum.STATUS_3.getName());
-			vo.setMessageCode(EbookPromptMessageEnum.STATUS_3.getCode());
-			// 获取pdf阅读地址
-			this.getPdfReadUrl(vo);
-			return vo;
-		}
 		// 是否免费
 		if (vo.getRealPrice() != null && vo.getRealPrice().doubleValue() != 0) {
 			vo.setIsFree(Integer.parseInt(BooleanStatusEnum.NO.getCode()));
 			/* -----------------付费，这里要判断是否有权限、或者已经购买------------- */
+			if (!redis.isExistMember()) {
+				// 未登录
+				vo.setXmlFile(null);
+				vo.setIsStatus(ReadOrShoppingCartTypeEnum.STATUS_1.getCode());
+				vo.setMessage(EbookPromptMessageEnum.STATUS_5.getName());
+				vo.setMessageCode(EbookPromptMessageEnum.STATUS_5.getCode());
+				// 获取pdf阅读地址
+				this.getPdfReadUrl(vo);
+				return vo;
+			}
 			// 已登录
 			// 登录用户是否是资源作者
 			if (StringUtils.isNotEmpty(vo.getAuthorId()) && StringUtils.isNotEmpty(redis.getMember().getAuthorId())
@@ -345,7 +345,6 @@ public class FgEbookServiceImpl extends BaseServiceImpl<Ebook, String> implement
 			this.getPdfReadUrl(vo);
 			return vo;
 		} else {
-			// 已登录
 			vo.setIsFree(Integer.parseInt(BooleanStatusEnum.YES.getCode()));
 			vo.setIsStatus(ReadOrShoppingCartTypeEnum.STATUS_0.getCode());
 			// 获取pdf阅读地址
@@ -378,18 +377,18 @@ public class FgEbookServiceImpl extends BaseServiceImpl<Ebook, String> implement
 			vo.setXmlFile(null);
 			return vo;
 		}
-		if (!redis.isExistMember()) {
-			// 未登录
-			vo.setIsStatus(ReadOrShoppingCartTypeEnum.STATUS_1.getCode());
-			vo.setMessage(EbookPromptMessageEnum.STATUS_3.getName());
-			vo.setMessageCode(EbookPromptMessageEnum.STATUS_3.getCode());
-			vo.setXmlFile(null);
-			return vo;
-		}
 		// 是否免费
 		if (solrDocument.get("realPrice") != null && !solrDocument.get("realPrice").toString().equals("0.00")) {
 			vo.setIsFree(Integer.parseInt(BooleanStatusEnum.NO.getCode()));
 			/* -----------------付费，这里要判断是否有权限、或者已经购买------------- */
+			if (!redis.isExistMember()) {
+				// 未登录
+				vo.setIsStatus(ReadOrShoppingCartTypeEnum.STATUS_1.getCode());
+				vo.setMessage(EbookPromptMessageEnum.STATUS_5.getName());
+				vo.setMessageCode(EbookPromptMessageEnum.STATUS_5.getCode());
+				vo.setXmlFile(null);
+				return vo;
+			}
 			// 已登录
 			// 登录用户是否是资源作者
 			if (solrDocument.get("authorId") != null && redis.getMember().getAuthorId() != null