圈子 首席列表

community-api/src/main/java/com/tanpu/community/api/beans/resp/Customer.java

@@ -17,8 +17,8 @@ import java.math.BigDecimal;
 @ApiModel(description = "客户信息")
 public class Customer {
 
-    @ApiModelProperty("用户id")
-    private String userId;//用户id
+    @ApiModelProperty("客户id")
+    private String customerId;//客户id
     @ApiModelProperty("姓名")
     private String userName;//
     @ApiModelProperty("手机号")

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

@@ -45,4 +45,7 @@ public class UserInfoNewChief implements Serializable {
     @ApiModelProperty(value = "成功案例客户id")
     private String clientId;
 
+    @ApiModelProperty(value = "头像url")
+    private String headImageUrl;
+
 }
\ No newline at end of file

community-service/src/main/java/com/tanpu/community/controller/HomePageController.java

@@ -9,10 +9,14 @@ import com.tanpu.community.api.beans.req.homepage.FollowRelReq;
 import com.tanpu.community.api.beans.req.homepage.QueryFollowReq;
 import com.tanpu.community.api.beans.req.homepage.QueryRecordThemeReq;
 import com.tanpu.community.api.beans.req.page.Page;
+import com.tanpu.community.api.beans.req.page.Pageable;
 import com.tanpu.community.api.beans.resp.Customer;
 import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoNew;
+import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoNewChief;
 import com.tanpu.community.manager.HomePageManager;
 import com.tanpu.community.manager.ThemeManager;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -54,6 +58,16 @@ public class HomePageController {
         return CommonResp.success(homePageManager.queryUserCustomerList(userId));
     }
 
+    @ApiOperation(value = "探普 首席投顾列表查询")
+    @GetMapping(value = "/queryChiefFinancialAdviserList")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNumber", value = "页码", required = true),
+            @ApiImplicitParam(name = "pageSize", value = "每页条数", required = true)
+    })
+    public CommonResp<Page<UserInfoNewChief>> queryChiefFinancialAdviserList(@RequestBody Pageable page) {
+        return CommonResp.success(homePageManager.queryChiefFinancialAdviserList(page));
+    }
+
 
     @PostMapping(value = "/followList")
     @ApiOperation("查询关注/粉丝列表")

community-service/src/main/java/com/tanpu/community/feign/fatools/FeignClientForFatools.java

 package com.tanpu.community.feign.fatools;
 
 import com.tanpu.common.api.CommonResp;
+import com.tanpu.community.api.beans.req.page.Page;
+import com.tanpu.community.api.beans.req.page.Pageable;
 import com.tanpu.community.api.beans.vo.feign.course.ShortVideoBaseInfoResp;
 import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoNew;
+import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoNewChief;
 import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoOrg;
 import com.tanpu.community.api.beans.vo.feign.user.FileQueryResp;
 import com.tanpu.community.api.beans.vo.feign.user.UserInfoVo;
@@ -11,6 +14,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
@@ -50,4 +54,8 @@ public interface FeignClientForFatools {
     @GetMapping(value = "/getUsetInfoByOrgUserId")
     CommonResp<List<UserInfoOrg>> getUsetInfoByOrgUserId(@RequestParam("orgUserId") String orgUserId);
 
+    @ApiOperation(value = "探普 首席投顾列表查询")
+    @GetMapping(value = "/queryChiefFinancialAdviserList")
+    CommonResp<Page<UserInfoNewChief>> queryChiefFinancialAdviserList(@RequestBody Pageable page);
+
 }

community-service/src/main/java/com/tanpu/community/feign/fatools/FeignbackForFatools.java

 package com.tanpu.community.feign.fatools;
 
 import com.tanpu.common.api.CommonResp;
+import com.tanpu.community.api.beans.req.page.Page;
+import com.tanpu.community.api.beans.req.page.Pageable;
 import com.tanpu.community.api.beans.vo.feign.course.ShortVideoBaseInfoResp;
 import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoNew;
+import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoNewChief;
 import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoOrg;
 import com.tanpu.community.api.beans.vo.feign.user.FileQueryResp;
 import com.tanpu.community.api.beans.vo.feign.user.UserInfoVo;
@@ -63,6 +66,12 @@ public class FeignbackForFatools implements FallbackFactory<FeignClientForFatool
                 log.info("FeignbackForFatools.getUsetInfoByOrgUserId", throwable);
                 return CommonResp.error();
             }
+
+            @Override
+            public CommonResp<Page<UserInfoNewChief>> queryChiefFinancialAdviserList(Pageable page) {
+                log.info("FeignbackForFatools.queryChiefFinancialAdviserList", throwable);
+                return CommonResp.error();
+            }
         };
     }
 

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

@@ -8,8 +8,10 @@ import com.tanpu.community.api.beans.qo.FollowQo;
 import com.tanpu.community.api.beans.req.homepage.FollowRelReq;
 import com.tanpu.community.api.beans.req.homepage.QueryFollowReq;
 import com.tanpu.community.api.beans.req.page.Page;
+import com.tanpu.community.api.beans.req.page.Pageable;
 import com.tanpu.community.api.beans.resp.Customer;
 import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoNew;
+import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoNewChief;
 import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoOrg;
 import com.tanpu.community.api.enums.*;
 import com.tanpu.community.dao.entity.community.FollowRelEntity;
@@ -46,8 +48,6 @@ public class HomePageManager {
     @Resource
     private FollowRelService followRelService;
     @Resource
-    private UserInfoService userInfoService;
-    @Resource
     private FeignClientForFatools feignClientForFatools;
     @Resource
     private FollowRelMapper followRelMapper;
@@ -60,8 +60,6 @@ public class HomePageManager {
     @Resource
     private FundInfoMapper fundInfoMapper;
     @Resource
-    private FeignClientForTanpuroom feignClientForTanpuroom;
-    @Resource
     private FeignClientForDiagnose feignClientForDiagnose;
     @Resource
     private FeignClientForCourse feignClientForCourse;
@@ -69,7 +67,7 @@ public class HomePageManager {
     //查询 个人中心 相关信息
     public UserInfoNew queryUsersListNew(String userIdMyself, String userId) {
         CommonResp<UserInfoNew> queryUsersListNew = feignClientForFatools.queryUsersListNew(StringUtils.isNotBlank(userId) ? userId : userIdMyself);
-        if (queryUsersListNew.isNotSuccess())  new BizException("内部接口调用失败");
+        if (queryUsersListNew.isNotSuccess() || ObjectUtils.anyNotNull(queryUsersListNew.getData()))  new BizException("内部接口调用失败");
         UserInfoNew userInfoNew = queryUsersListNew.getData();
 
         if (StringUtils.isNotBlank(userId) && !StringUtils.equals(userIdMyself, userId)) { //查询别人的个人主页
@@ -98,7 +96,7 @@ public class HomePageManager {
                 List<Customer> customers = queryUserCustomerList(userId);
                 Optional<Customer> first = customers.stream().max(Comparator.comparing(Customer::getTotalMarket));
                 if (first.isPresent()) {
-                    userInfoNew.getUserInfoNewChief().setClientId(first.get().getUserId());
+                    userInfoNew.getUserInfoNewChief().setClientId(first.get().getCustomerId());
                 } else {
                     userInfoNew.getUserInfoNewChief().setClientId(null);
                 }
@@ -157,6 +155,12 @@ public class HomePageManager {
         return userInfoNew;
     }
 
+    public Page<UserInfoNewChief> queryChiefFinancialAdviserList(Pageable page) {
+        CommonResp<Page<UserInfoNewChief>> pageCommonResp = feignClientForFatools.queryChiefFinancialAdviserList(page);
+        return pageCommonResp.getData();
+
+    }
+
     private void getFansNUmAndFollowNum(UserInfoNew userInfoNew) {
         Integer fansNumber = followRelMapper.selectCount(new LambdaQueryWrapper<FollowRelEntity>().eq(FollowRelEntity::getFollowUserId, userInfoNew.getUserId())
                 .eq(FollowRelEntity::getDeleteTag, BizStatus.DeleteTag.tag_init));