--no commit message

app/resource/src/main/java/com/zrqx/resource/fg/service/courselibrary/FgCourseLibrarySerivceImpl.java

@@ -213,7 +213,7 @@ public class FgCourseLibrarySerivceImpl extends BaseServiceImpl<CourseLibrary, S
 			vo.setIsCollection(Integer.parseInt(BooleanStatusEnum.NO.getCode()));
 		} else {
 			
-			
+		
 			
 			
 			
@@ -223,8 +223,6 @@ public class FgCourseLibrarySerivceImpl extends BaseServiceImpl<CourseLibrary, S
 			form.setType(AllResourceTypeEnum.COURSE.getCode().toString());
 			vo.setIsCollection(fgMemberConllectionManage.checkIsCollect(form));
 			vo.setIsCollection(fgMemberConllectionManage.checkIsCollect(form));
-			LoginMemberInfo memberInfo = redis.getMember();
-			vo.setIsVip(memberInfo.getVip());
 			
 			//是否购买
             CallBack<Boolean> result = orderClient.isExistBuyGoods(form);
@@ -269,6 +267,7 @@ public class FgCourseLibrarySerivceImpl extends BaseServiceImpl<CourseLibrary, S
 			// 判断是否为会员
 			MemberInfo memberInfo = personalMemberClient.getMember(redis.getMember().getId()).getData();
 			if (memberInfo != null && VipStatusEnum.STATUS_1.getCode().equals(memberInfo.getVip())) {
+				vo.setIsVip(memberInfo.getVip());
 				return vo;
 			}
 			// 不是机构会员，则为普通会员或者专家会员

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

@@ -13,12 +13,15 @@ import org.springframework.stereotype.Service;
 
 import com.github.pagehelper.PageHelper;
 import com.zrqx.core.client.form.order.GoodsForm;
+import com.zrqx.core.client.member.fg.FgPersonalMemberClient;
 import com.zrqx.core.client.member.fg.OrganClient;
 import com.zrqx.core.client.order.fg.FgOrderClient;
+import com.zrqx.core.client.vo.member.MemberInfo;
 import com.zrqx.core.commons.form.LoginMemberInfo;
 import com.zrqx.core.commons.redis.Redis;
 import com.zrqx.core.enums.BooleanStatusEnum;
 import com.zrqx.core.enums.GoodsTypeEnum;
+import com.zrqx.core.enums.member.VipStatusEnum;
 import com.zrqx.core.enums.resource.BookCopyrightTypeEnum;
 import com.zrqx.core.enums.resource.BookSaleStatusEnum;
 import com.zrqx.core.enums.resource.EbookPromptMessageEnum;
@@ -65,7 +68,8 @@ public class FgEbookServiceImpl extends BaseServiceImpl<Ebook, String> implement
 	private FgEbookMapper ebookMapper;
 	@Autowired
 	private FgEbookDiyTypeMapper ebookDiyTypeMapper;
-	
+	@Autowired
+	private FgPersonalMemberClient personalMemberClient;
 	@Autowired
 	private FgRecordMapper recordMapper;
 	
@@ -237,8 +241,7 @@ public class FgEbookServiceImpl extends BaseServiceImpl<Ebook, String> implement
 			form.setId(oid);
 			form.setType(GoodsTypeEnum.EBOOK.getCode());
 			vo.setIsCollection(fgMemberConllectionManage.checkIsCollect(form));
-			LoginMemberInfo memberInfo = redis.getMember();
-			vo.setIsVip(memberInfo.getVip());
+		
 		}
 		// 阅读人数
 		Record record = new Record();
@@ -271,6 +274,11 @@ public class FgEbookServiceImpl extends BaseServiceImpl<Ebook, String> implement
 			if(redis.getMember().getOrganId() != null){
 				// 是机构会员
 				this.organMember(vo);
+			}
+			// 判断是否为会员
+			MemberInfo memberInfo = personalMemberClient.getMember(redis.getMember().getId()).getData();
+			if (memberInfo != null && VipStatusEnum.STATUS_1.getCode().equals(memberInfo.getVip())) {
+				vo.setIsVip(memberInfo.getVip());
 				return vo;
 			}
 			// 不是机构会员，则为普通会员或者专家会员

app/resource/src/main/java/com/zrqx/resource/fg/service/videolibrary/FgVideoLibrarySerivceImpl.java

@@ -197,8 +197,7 @@ public class FgVideoLibrarySerivceImpl extends BaseServiceImpl<VideoLibrary, Str
 			form.setId(oid);
 			form.setType(GoodsTypeEnum.VIDEO.getCode());
 			vo.setIsCollection(fgMemberConllectionManage.checkIsCollect(form));
-			LoginMemberInfo memberInfo = redis.getMember();
-			vo.setIsVip(memberInfo.getVip());
+		
 		}
 		// 未定价
 		if (vo.getRealPrice() == null) {
@@ -254,6 +253,7 @@ public class FgVideoLibrarySerivceImpl extends BaseServiceImpl<VideoLibrary, Str
 			// 判断是否为会员
 			MemberInfo memberInfo = personalMemberClient.getMember(redis.getMember().getId()).getData();
 			if (memberInfo != null && VipStatusEnum.STATUS_1.getCode().equals(memberInfo.getVip())) {
+				vo.setIsVip(memberInfo.getVip());
 				return vo;
 			}
 			// 不是机构会员，则为普通会员或者专家会员