--no commit message

com.zrqx.member/src/main/java/com/zrqx/member/fg/member/controller/FgMemberController.java

@@ -28,7 +28,7 @@ public class FgMemberController {
 	
 	@ApiOperation(value = "修改上次观看视频",notes="修改上次观看视频")
 	@PostMapping(value = ResourceRequestPath.UPDATE + ResourceRequestPath.VIDEO_LIBRARY)
-	public CallBack<Boolean> updateVideo(@RequestBody String video) {
+	public CallBack<Boolean> updateVideo(@RequestBody Integer video) {
 		Member member = new Member();
 		member.setId(redis.getMember().getId());
 		//member.setId(101040);
@@ -38,7 +38,7 @@ public class FgMemberController {
 	
 	@ApiOperation(value = "上次观看视频",notes="上次观看视频")
 	@PostMapping(value = ResourceRequestPath.VIDEO_LIBRARY+ResourceRequestPath.RECORD)
-	public CallBack<String> showVideo() {
+	public CallBack<Integer> showVideo() {
 		Member member = service.selectByPrimaryKey(redis.getMember().getId());
 		return CallBack.success(member.getVideo());
 	}

com.zrqx.member/src/main/java/com/zrqx/member/fg/member/service/FgMemberServiceImpl.java

@@ -77,6 +77,11 @@ public class FgMemberServiceImpl  extends BaseServiceImpl<Member,Integer> implem
 		if(m.getLevel() == LevelEnum.PERSONAL.getCode()) {
 			PersonalMember pm = pmapper.selectByPrimaryKey(m.getId());
 			info.setImg(pm.getImg());
+			if(pm != null && pm.getVip() != null){
+				info.setVip(pm.getVip());
+			}else{
+				info.setVip(0);
+			}
 		}else if (m.getLevel() == LevelEnum.EXPERT.getCode()){
 			ExpertMember em = emapper.selectByPrimaryKey(m.getId());
 			info.setAuthorId(em.getAuthorId());