--no commit message

core/src/main/java/com/zrqx/core/client/member/fg/FgPersonalMemberClient.java

@@ -5,7 +5,9 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 
+import com.zrqx.core.client.vo.member.MemberInfo;
 import com.zrqx.core.client.vo.member.VipVO;
 import com.zrqx.core.util.response.CallBack;
 
@@ -47,4 +49,14 @@ public interface FgPersonalMemberClient {
 	 */
 	@GetMapping(value = "/fg/vip/{oid}")
 	CallBack<VipVO> getById(@PathVariable(value = "oid") Integer oid);
+	
+	/**
+	 * 根据id查询vip服务详细信息
+	 * @param oid
+	 * @return
+	 * @author ycw
+	 * @date: 2019年6月10日 下午3:31:15
+	 */
+	@GetMapping(value = "/fg/personal-center/get/member")
+	public CallBack<MemberInfo> getMember(@RequestParam("id") Integer id);
 }

core/src/main/java/com/zrqx/core/client/member/fg/FgPersonalMemberClientHystric.java

@@ -4,6 +4,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
+import com.zrqx.core.client.vo.member.MemberInfo;
 import com.zrqx.core.client.vo.member.VipVO;
 import com.zrqx.core.util.response.CallBack;
 
@@ -31,4 +32,10 @@ public class FgPersonalMemberClientHystric implements FgPersonalMemberClient {
 		logger.info("订单code:" + code +"同步vip接口失败");
 		return CallBack.fail();
 	}
+
+	@Override
+	public CallBack<MemberInfo> getMember(Integer id) {
+		logger.info("查询会员信息失败");
+		return CallBack.fail();
+	}
 }

core/src/main/java/com/zrqx/core/client/vo/member/MemberInfo.java

+package com.zrqx.core.client.vo.member;
+
+import java.util.Date;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "MemberInfo", description = "用户登录信息")
+public class MemberInfo {
+	@ApiModelProperty("会员id")
+	private Integer id;
+	@ApiModelProperty("头像地址")
+	private String img;
+	@ApiModelProperty("昵称")
+	private String nickName;
+	@ApiModelProperty("性别")
+	private Integer sex;
+	@ApiModelProperty("邮箱")
+	private String email;
+	@ApiModelProperty("会员账号")
+	private String account;
+	@ApiModelProperty("用户类别：0 普通用户，1专家用户，2机构用户")
+	private Integer level;
+	@ApiModelProperty("手机号")
+	private String phone;
+	@ApiModelProperty("真实姓名")
+	private String name;
+	@ApiModelProperty("机构名称 ")
+	private String organName;
+	@ApiModelProperty("学历")
+	private String academic;
+	@ApiModelProperty("职业")
+	private String dept;
+	@ApiModelProperty("职称")
+	private String title;
+	@ApiModelProperty("vip会员  0否 1是 2已过期")
+	private Integer vip;
+	@ApiModelProperty("vip类型id")
+	private Integer vipId;
+	@ApiModelProperty("vip会员结束日期")
+	private Date vipEndTime;
+	@ApiModelProperty("版本：1网络版，2镜像版")
+	private Integer version;
+	@ApiModelProperty("开始时间")
+	private String beginTime;
+	@ApiModelProperty("到期时间")
+	private String endTime;
+	@ApiModelProperty("购买课程分类")
+	private String courseDiyTypeName;
+	@ApiModelProperty("最后登录时间")
+	private String loginTime;
+}