个人主页

community-api/src/main/java/com/tanpu/community/api/beans/vo/feign/fatools/UserInfoNew.java

@@ -15,10 +15,10 @@ import java.util.List;
  * @create: 2021-07-15 14:37
  **/
 @Data
-@Builder
 @ApiModel(description = "用户信息 圈子使用")
 public class UserInfoNew implements Serializable {
 
+    private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("主页等级 1普通主页 2首席投顾主页 3机构主页")
     private Integer personalCenterType;
@@ -85,59 +85,11 @@ public class UserInfoNew implements Serializable {
     private String workshopIntroduction;//工作室简介
 
     //↓↓↓↓↓首席投顾↓↓↓↓↓↓
-    @ApiModelProperty(value = "姓名")
-    private String userName;
-    @ApiModelProperty(value = "头像背图url")
-    private String backImageUrl;
-    @ApiModelProperty(value = "是否展示专访视频 0不展示 1展示")
-    private Integer interviewVideoIsShow;
-    @ApiModelProperty(value = "专访视频 标题")
-    private String interviewVideoTitle;
-    @ApiModelProperty(value = "专访视频 url")
-    private String interviewVideoUrl;
-    @ApiModelProperty(value = "个人简介")
-    private String personalProfile;
-    @ApiModelProperty(value = "管理规模")
-    private String managementScale;
-    @ApiModelProperty(value = "从业年限 (单位:年)")
-    private String workingYears;
-    @ApiModelProperty(value = "投资理念")
-    private String investmentPhilosophy;
-    @ApiModelProperty(value = "擅长领域")
-    private String areasOfExpertise;
-    @ApiModelProperty(value = "证书 json")
-    private String credentials;
-    @ApiModelProperty(value = "成功案例客户id")
-    private String clientId;
-
-    //↓↓↓↓ 机构 ↓↓↓↓
-    @ApiModelProperty(value = "申请用户id")
-    private String applyUserId;
-    @ApiModelProperty(value = "机构id")
-    private String userIdOrg;
-    @ApiModelProperty(value = "公司名称")
-    private String companyName;
-    @ApiModelProperty(value = "公司全称")
-    private String companyFullName;
-    @ApiModelProperty(value = "营业执照账号")
-    private String businessLicenseNumber;
-    @ApiModelProperty(value = "营业执照 图片url")
-    private String businessLicenseImageUrl;
-    @ApiModelProperty(value = "机构用户身份公函 url")
-    private String identityLetterUrl;
-    @ApiModelProperty(value = "机构认证信息登记表 url")
-    private String orgAuthInfoFormUrl;
-    @ApiModelProperty(value = "运营人员 职位")
-    private String position;
-    @ApiModelProperty(value = "审核状态 1初始提交 2审核不通过 3审核通过")
-    private Integer auditStatus;
-    @ApiModelProperty(value = "认证名称")
-    private String certName;
-    @ApiModelProperty(value = "是否匹配现有基金公司 0不匹配 1匹配")
-    private Integer isExistOrg;
-    @ApiModelProperty(value = "所属基金公司id")
-    private String belongOrgId;
-    @ApiModelProperty(value = "所属基金公司类型 0公募 1私募")
-    private Integer belongOrgType;
+    @ApiModelProperty(value = "首席投顾")
+    private UserInfoNewChief userInfoNewChief;
+
+    //↓↓↓↓↓机构用户信息↓↓↓↓↓↓
+    @ApiModelProperty(value = "机构用户信息")
+    private UserInfoNewOrg userInfoNewOrg;
 
 }
\ No newline at end of file

community-api/src/main/java/com/tanpu/community/api/beans/vo/feign/fatools/UserInfoNewChief.java

+package com.tanpu.community.api.beans.vo.feign.fatools;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @description: 用户信息 圈子使用
+ * @author: zejia zj wu
+ * @create: 2021-07-15 14:37
+ **/
+@Data
+@Builder
+@ApiModel(description = "用户信息 首席投顾专用信息")
+public class UserInfoNewChief implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+        //↓↓↓↓↓首席投顾↓↓↓↓↓↓
+    @ApiModelProperty(value = "姓名")
+    private String userName;
+    @ApiModelProperty(value = "头像背图url")
+    private String backImageUrl;
+    @ApiModelProperty(value = "是否展示专访视频 0不展示 1展示")
+    private Integer interviewVideoIsShow;
+    @ApiModelProperty(value = "专访视频 标题")
+    private String interviewVideoTitle;
+    @ApiModelProperty(value = "专访视频 url")
+    private String interviewVideoUrl;
+    @ApiModelProperty(value = "个人简介")
+    private String personalProfile;
+    @ApiModelProperty(value = "管理规模")
+    private String managementScale;
+    @ApiModelProperty(value = "从业年限 (单位:年)")
+    private String workingYears;
+    @ApiModelProperty(value = "投资理念")
+    private String investmentPhilosophy;
+    @ApiModelProperty(value = "擅长领域")
+    private String areasOfExpertise;
+    @ApiModelProperty(value = "证书 json")
+    private String credentials;
+    @ApiModelProperty(value = "成功案例客户id")
+    private String clientId;
+
+}
\ No newline at end of file

community-api/src/main/java/com/tanpu/community/api/beans/vo/feign/fatools/UserInfoNewOrg.java

+package com.tanpu.community.api.beans.vo.feign.fatools;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @description: 用户信息 机构
+ * @author: zejia zj wu
+ * @create: 2021-07-15 14:37
+ **/
+@Data
+@Builder
+@ApiModel(description = "用户信息 机构")
+public class UserInfoNewOrg implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    //↓↓↓↓ 机构 ↓↓↓↓
+    @ApiModelProperty(value = "申请用户id")
+    private String applyUserId;
+    @ApiModelProperty(value = "机构id")
+    private String userIdOrg;
+    @ApiModelProperty(value = "公司名称")
+    private String companyName;
+    @ApiModelProperty(value = "公司全称")
+    private String companyFullName;
+    @ApiModelProperty(value = "营业执照账号")
+    private String businessLicenseNumber;
+    @ApiModelProperty(value = "营业执照 图片url")
+    private String businessLicenseImageUrl;
+    @ApiModelProperty(value = "机构用户身份公函 url")
+    private String identityLetterUrl;
+    @ApiModelProperty(value = "机构认证信息登记表 url")
+    private String orgAuthInfoFormUrl;
+    @ApiModelProperty(value = "运营人员 职位")
+    private String position;
+    @ApiModelProperty(value = "审核状态 1初始提交 2审核不通过 3审核通过")
+    private Integer auditStatus;
+    @ApiModelProperty(value = "认证名称")
+    private String certName;
+    @ApiModelProperty(value = "是否匹配现有基金公司 0不匹配 1匹配")
+    private Integer isExistOrg;
+    @ApiModelProperty(value = "所属基金公司id")
+    private String belongOrgId;
+    @ApiModelProperty(value = "所属基金公司类型 0公募 1私募")
+    private Integer belongOrgType;
+
+}
\ No newline at end of file

community-service/src/main/java/com/tanpu/community/feign/course/FeignBackClientForCourse.java

@@ -36,6 +36,13 @@ public class FeignBackClientForCourse implements FallbackFactory<FeignClientForC
                 log.error("FeignClientForCourse.getCoursePackageDetailInfo-查询课程包id:{}", id);
                 return CommonResp.failed("调用getCoursePackageDetailInfo失败");
             }
+
+            @Override
+            public CommonResp<Integer> getStudyCourseCount(String userId) {
+                log.error("请求信息", throwable);
+                log.error("FeignClientForCourse.getStudyCourseCount-查询userid:{}", userId);
+                return CommonResp.failed("调用getStudyCourseCount失败");
+            }
         };
     }
 }

community-service/src/main/java/com/tanpu/community/feign/course/FeignClientForCourse.java

@@ -32,4 +32,8 @@ public interface FeignClientForCourse {
     @ApiOperation("详情页信息")
     @GetMapping("/course/detail")
     CommonResp<CoursePackageDetail> getCoursePackageDetailInfo(@ApiParam(value = "课程包id", required = true) @RequestParam("id") String id);
+
+    @ApiOperation("查询已学习课程包总数")
+    @GetMapping("/course/getStudyCourseCount")
+    CommonResp<Integer> getStudyCourseCount(@ApiParam(value = "用户id") @RequestParam(value = "userId",required = false) String userId);
 }

community-service/src/main/java/com/tanpu/community/feign/tanpuroom/FeignBackClientForTanpuroom.java

@@ -31,12 +31,6 @@ public class FeignBackClientForTanpuroom implements FallbackFactory<FeignClientF
                 return null;
             }
 
-            @Override
-            public CommonResp<Integer> myOrderCount(String userId) {
-                log.error("请求信息", throwable);
-                log.error("FeignBackClientForTanpuroom.myOrderCount-userId:{}", userId);
-                return null;
-            }
         };
     }
 }

community-service/src/main/java/com/tanpu/community/feign/tanpuroom/FeignClientForTanpuroom.java

@@ -28,7 +28,4 @@ public interface FeignClientForTanpuroom {
     @PostMapping(value = "/curriculumInfos/detail", produces = {"application/json"})
     CommonResp<CurriculumDetailVo> queryCurriculumDetail(@RequestBody CurriCulumInfoDetailDto req);
 
-    @ApiOperation("已购总数")
-    @GetMapping("/my/order/count")
-    CommonResp<Integer> myOrderCount(@ApiParam(value = "userId", required = true) @RequestParam("userId") String userId);
 }

community-service/src/main/java/com/tanpu/community/manager/HomePageManager.java

@@ -24,6 +24,7 @@ import com.tanpu.community.dao.mapper.fund.CompanyInfoMapper;
 import com.tanpu.community.dao.mapper.fund.FundInfoMapper;
 import com.tanpu.community.dao.mapper.jydb.MfAdvisorscalerankMapper;
 import com.tanpu.community.dao.mapper.jydb.MfInvestadvisoroutlineMapper;
+import com.tanpu.community.feign.course.FeignClientForCourse;
 import com.tanpu.community.feign.diagnose.FeignClientForDiagnose;
 import com.tanpu.community.feign.fatools.FeignClientForFatools;
 import com.tanpu.community.feign.tanpuroom.FeignClientForTanpuroom;
@@ -46,9 +47,9 @@ import java.util.stream.Collectors;
 @Service
 public class HomePageManager {
 
-    @Autowired
+    @Resource
     private FollowRelService followRelService;
-    @Autowired
+    @Resource
     private UserInfoService userInfoService;
     @Resource
     private FeignClientForFatools feignClientForFatools;
@@ -66,13 +67,14 @@ public class HomePageManager {
     private FeignClientForTanpuroom feignClientForTanpuroom;
     @Resource
     private FeignClientForDiagnose feignClientForDiagnose;
+    @Resource
+    private FeignClientForCourse feignClientForCourse;
 
     //查询 个人中心 相关信息
     public UserInfoNew queryUsersListNew(String userIdMyself, String userId) {
-        CommonResp<UserInfoNew> userInfoNewCommonResp = feignClientForFatools.queryUsersListNew(StringUtils.isNotBlank(userId) ? userId : userIdMyself);
-        if (userInfoNewCommonResp.isNotSuccess())  new BizException("内部接口调用失败");
-        UserInfoNew userInfoNew = userInfoNewCommonResp.getData();
-
+        CommonResp<UserInfoNew> queryUsersListNew = feignClientForFatools.queryUsersListNew(StringUtils.isNotBlank(userId) ? userId : userIdMyself);
+        if (queryUsersListNew.isNotSuccess())  new BizException("内部接口调用失败");
+        UserInfoNew userInfoNew = queryUsersListNew.getData();
         // 关注 按钮的显示逻辑
         if (StringUtils.isNotBlank(userId)) { //查询别人的个人主页
             userInfoNew.setIsShowFollowButton(0);
@@ -97,37 +99,37 @@ public class HomePageManager {
             // 首席投顾 添加专栏信息 （前端自己取）
             // 成功案例客户
             // 默认显示该投顾管理的客户里，总资产最高的客户
-            if (StringUtils.isBlank(userInfoNew.getClientId())) {
+            if (StringUtils.isBlank(userInfoNew.getUserInfoNewChief().getClientId())) {
                 List<Customer> customers = queryUserCustomerList(userId);
-                Optional<Customer> first = customers.stream().sorted(Comparator.comparing(Customer::getTotalMarket)).findFirst();
+                Optional<Customer> first = customers.stream().max(Comparator.comparing(Customer::getTotalMarket));
                 if (first.isPresent()) {
-                    userInfoNew.setClientId(first.get().getUserId());
+                    userInfoNew.getUserInfoNewChief().setClientId(first.get().getUserId());
                 } else {
-                    userInfoNew.setClientId(null);
+                    userInfoNew.getUserInfoNewChief().setClientId(null);
                 }
             }
         } else if (2 == userInfoNew.getUserType()){
             // 机构账号
             userInfoNew.setPersonalCenterType(3);
-            if (0 == userInfoNew.getBelongOrgType() && StringUtils.isNotBlank(userInfoNew.getBelongOrgId())){ // 公募
+            if (0 == userInfoNew.getUserInfoNewOrg().getBelongOrgType() && StringUtils.isNotBlank(userInfoNew.getUserInfoNewOrg().getBelongOrgId())){ // 公募
                 //设置 基金数
                 MfAdvisorscalerank mfAdvisorscalerank = mfAdvisorscalerankMapper.selectOne(new LambdaQueryWrapper<MfAdvisorscalerank>()
-                        .eq(MfAdvisorscalerank::getInvestadvisorcode, userInfoNew.getBelongOrgId())
+                        .eq(MfAdvisorscalerank::getInvestadvisorcode, userInfoNew.getUserInfoNewOrg().getBelongOrgId())
                         .last("limit 1"));
                 userInfoNew.setFundNumber(ObjectUtils.anyNotNull(mfAdvisorscalerank) ? mfAdvisorscalerank.getTotalfundn() : null);
                 //设置成立时间 和 备案编号(公募没有备案编号)
                 MfInvestadvisoroutline mfInvestadvisoroutline = mfInvestadvisoroutlineMapper.selectOne(new LambdaQueryWrapper<MfInvestadvisoroutline>()
-                        .eq(MfInvestadvisoroutline::getInvestadvisorcode, userInfoNew.getBelongOrgId())
+                        .eq(MfInvestadvisoroutline::getInvestadvisorcode, userInfoNew.getUserInfoNewOrg().getBelongOrgId())
                         .last("limit 1"));
                 userInfoNew.setFounded(ObjectUtils.anyNotNull(mfInvestadvisoroutline) ? mfInvestadvisoroutline.getEstablishmentdate().getTime() : null);
             }
-            if(1 == userInfoNew.getBelongOrgType() && StringUtils.isNotBlank(userInfoNew.getBelongOrgId())){ // 私募
+            if(1 == userInfoNew.getUserInfoNewOrg().getBelongOrgType() && StringUtils.isNotBlank(userInfoNew.getUserInfoNewOrg().getBelongOrgId())){ // 私募
                 //设置 基金数
-                Integer integer = fundInfoMapper.selectCount(new LambdaQueryWrapper<FundInfo>().eq(FundInfo::getTrustId, userInfoNew.getBelongOrgId()));
+                Integer integer = fundInfoMapper.selectCount(new LambdaQueryWrapper<FundInfo>().eq(FundInfo::getTrustId, userInfoNew.getUserInfoNewOrg().getBelongOrgId()));
                 userInfoNew.setFundNumber(integer);
 
                 //设置成立时间 和 备案编号
-                CompanyInfo companyInfo = companyInfoMapper.selectById(userInfoNew.getBelongOrgId());
+                CompanyInfo companyInfo = companyInfoMapper.selectById(userInfoNew.getUserInfoNewOrg().getBelongOrgId());
                 if (ObjectUtils.anyNotNull(companyInfo)) {
                     userInfoNew.setFounded(companyInfo.getEstablishDate().getTime());
                     userInfoNew.setRecordNumber(companyInfo.getRegisterNumber());
@@ -153,8 +155,8 @@ public class HomePageManager {
         } else {
             //普通主页
             userInfoNew.setPersonalCenterType(1);
-            //设置课程数
-            CommonResp<Integer> integerCommonResp = feignClientForTanpuroom.myOrderCount(userId);
+            //设置课程数(学习数)
+            CommonResp<Integer> integerCommonResp = feignClientForCourse.getStudyCourseCount(userId);
             if (integerCommonResp.isSuccess()) userInfoNew.setCourseNumber(integerCommonResp.getData());
         }
         return userInfoNew;