修改图书浏览权限和添加图书评分

app/resource/src/main/java/com/zrqx/resource/fg/controller/ebook/FgEbookController.java

@@ -135,9 +135,13 @@ public class FgEbookController {
 		fgQueryCommentForm.setResourceId(oid);
 		fgQueryCommentForm.setResourceType(AllResourceTypeEnum.BOOK.getCode());
 		FgCommentNumAndScoreVo fgCommentNumAndScoreVo = sysuserClient.getCommentNumAndScore(fgQueryCommentForm).getData();
+		Integer resourceScore = 5;
 		if(fgCommentNumAndScoreVo != null){
 			vo.setCommentNum(fgCommentNumAndScoreVo.getCommentNum());
-			vo.setResourceScore(fgCommentNumAndScoreVo.getResourceScore());	
+			if(fgCommentNumAndScoreVo.getResourceScore() != null) {
+				resourceScore = fgCommentNumAndScoreVo.getResourceScore();
+			}
+			vo.setResourceScore(resourceScore);
 		}
 		//保存机构用户浏览记录
 		FgSaveOrganMemberRecordForm form = new FgSaveOrganMemberRecordForm();

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

@@ -3,6 +3,9 @@ package com.zrqx.resource.fg.service.ebook;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.zrqx.core.client.member.fg.FgPersonalMemberClient;
+import com.zrqx.core.client.vo.member.MemberInfo;
+import com.zrqx.core.enums.member.VipStatusEnum;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.solr.common.SolrDocument;
 import org.slf4j.Logger;
@@ -80,6 +83,8 @@ public class FgEbookServiceImpl extends BaseServiceImpl<Ebook, String> implement
 	private FgMemberConllectionManage fgMemberConllectionManage;
 	@Autowired
 	private FgPromotionManage fgPromotionManage;
+	@Autowired
+	private FgPersonalMemberClient personalMemberClient;
 	
 	@Override
 	public BaseMapper<Ebook> getMapper() {
@@ -295,6 +300,11 @@ public class FgEbookServiceImpl extends BaseServiceImpl<Ebook, String> implement
 				this.getPdfReadUrl(vo);
 				return vo;
 			}
+			// 判断是否为会员
+			MemberInfo memberInfo = personalMemberClient.getMember(redis.getMember().getId()).getData();
+			if (memberInfo != null && VipStatusEnum.STATUS_1.getCode().equals(memberInfo.getVip())) {
+				return vo;
+			}
 			// 不是机构会员，则为普通会员或者专家会员
 			this.personalAndExpertMember(vo);
 			// 获取pdf阅读地址
@@ -478,7 +488,7 @@ public class FgEbookServiceImpl extends BaseServiceImpl<Ebook, String> implement
 	 * @author ycw
 	 * @date: 2019年2月22日 上午11:08:28
 	 */
-	private void personalAndExpertMember(FgEbookVO vo){
+	private FgEbookVO personalAndExpertMember(FgEbookVO vo){
 		// 普通会员或者专家会员，判断是否购买该图书
 		GoodsForm goodsForm = new GoodsForm();
 		goodsForm.setId(vo.getId());
@@ -487,7 +497,7 @@ public class FgEbookServiceImpl extends BaseServiceImpl<Ebook, String> implement
 		if (result.hasEntity() && result.getData()) {
 			vo.setIsBuy(Integer.parseInt(BooleanStatusEnum.YES.getCode()));
 			vo.setIsStatus(ReadOrShoppingCartTypeEnum.STATUS_0.getCode());
-			return ;
+			return vo;
 		}
 		logger.info("该商品未购买");
 		vo.setIsBuy(Integer.parseInt(BooleanStatusEnum.NO.getCode()));
@@ -496,7 +506,7 @@ public class FgEbookServiceImpl extends BaseServiceImpl<Ebook, String> implement
 		vo.setMessage(ArticlePromptMessageEnum.STATUS_4.getName());
 		vo.setMessageCode(EbookPromptMessageEnum.STATUS_4.getCode());
 		vo.setIsStatus(ReadOrShoppingCartTypeEnum.STATUS_1.getCode());
-		return ;
+		return vo;
 	}
 	
 	/**