push

yd-insurance-base-api/src/main/java/com/yd/insurance/base/api/controller/ApiUserSaleExpandController.java

@@ -6,6 +6,7 @@ import com.yd.insurance.base.api.service.ApiUserSaleExpandService;
 import com.yd.insurance.base.feign.client.usersaleexpand.ApiUserSaleExpandFeignClient;
 import com.yd.insurance.base.feign.request.usersaleexpand.ApiUserSaleExpandAddRequest;
 import com.yd.insurance.base.feign.request.usersaleexpand.ApiUserSaleExpandEditRequest;
+import com.yd.insurance.base.feign.request.usersaleexpand.ApiUserSaleExpandListRequest;
 import com.yd.insurance.base.feign.request.usersaleexpand.ApiUserSaleExpandPageRequest;
 import com.yd.insurance.base.feign.response.usersaleexpand.ApiUserSaleExpandDetailResponse;
 import com.yd.insurance.base.feign.response.usersaleexpand.ApiUserSaleExpandPageResponse;
@@ -14,6 +15,8 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * 保险-转介人（销售员）信息
  *
@@ -38,6 +41,16 @@ public class ApiUserSaleExpandController implements ApiUserSaleExpandFeignClient
         return apiUserSaleExpandService.page(request);
     }
 
+    /**
+     * 销售员（转介人）列表查询
+     * @param request
+     * @return
+     */
+    @Override
+    public Result<List<ApiUserSaleExpandDetailResponse>> list(ApiUserSaleExpandListRequest request) {
+        return apiUserSaleExpandService.list(request);
+    }
+
     @Override
     public Result<ApiUserSaleExpandDetailResponse> detail(String userSaleBizId, String clientUserBizId) {
         return apiUserSaleExpandService.detail(userSaleBizId,clientUserBizId);

yd-insurance-base-api/src/main/java/com/yd/insurance/base/api/service/ApiUserSaleExpandService.java

@@ -4,13 +4,18 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yd.common.result.Result;
 import com.yd.insurance.base.feign.request.usersaleexpand.ApiUserSaleExpandAddRequest;
 import com.yd.insurance.base.feign.request.usersaleexpand.ApiUserSaleExpandEditRequest;
+import com.yd.insurance.base.feign.request.usersaleexpand.ApiUserSaleExpandListRequest;
 import com.yd.insurance.base.feign.request.usersaleexpand.ApiUserSaleExpandPageRequest;
 import com.yd.insurance.base.feign.response.usersaleexpand.ApiUserSaleExpandDetailResponse;
 import com.yd.insurance.base.feign.response.usersaleexpand.ApiUserSaleExpandPageResponse;
 
+import java.util.List;
+
 public interface ApiUserSaleExpandService {
     Result<IPage<ApiUserSaleExpandPageResponse>> page(ApiUserSaleExpandPageRequest request);
 
+    Result<List<ApiUserSaleExpandDetailResponse>> list(ApiUserSaleExpandListRequest request);
+
     Result<ApiUserSaleExpandDetailResponse> detail(String userSaleBizId, String clientUserBizId);
 
     Result add(ApiUserSaleExpandAddRequest request);

yd-insurance-base-api/src/main/java/com/yd/insurance/base/api/service/impl/ApiUserSaleExpandServiceImpl.java

 package com.yd.insurance.base.api.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yd.common.enums.CommonEnum;
@@ -10,17 +11,22 @@ import com.yd.common.utils.RandomStringGenerator;
 import com.yd.insurance.base.api.service.ApiUserSaleExpandService;
 import com.yd.insurance.base.feign.request.usersaleexpand.ApiUserSaleExpandAddRequest;
 import com.yd.insurance.base.feign.request.usersaleexpand.ApiUserSaleExpandEditRequest;
+import com.yd.insurance.base.feign.request.usersaleexpand.ApiUserSaleExpandListRequest;
 import com.yd.insurance.base.feign.request.usersaleexpand.ApiUserSaleExpandPageRequest;
 import com.yd.insurance.base.feign.response.usersaleexpand.ApiUserSaleExpandDetailResponse;
 import com.yd.insurance.base.feign.response.usersaleexpand.ApiUserSaleExpandPageResponse;
+import com.yd.insurance.base.service.dto.QueryUserSaleExpandDTO;
 import com.yd.insurance.base.service.model.UserSaleExpand;
 import com.yd.insurance.base.service.service.IUserSaleExpandService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 @Slf4j
 @Service
@@ -42,6 +48,30 @@ public class ApiUserSaleExpandServiceImpl implements ApiUserSaleExpandService {
     }
 
     /**
+     * 销售员（转介人）列表查询
+     * @param request
+     * @return
+     */
+    @Override
+    public Result<List<ApiUserSaleExpandDetailResponse>> list(ApiUserSaleExpandListRequest request) {
+        log.info("销售员（转介人）列表查询=>ApiUserSaleExpandListRequest:{}", JSON.toJSONString(request));
+        List<UserSaleExpand> userSaleExpandList = iUserSaleExpandService.queryList(QueryUserSaleExpandDTO.builder()
+                .clientUserBizIdList(request.getClientUserBizIdList())
+                .phone(request.getPhone())
+                .build());
+        log.info("销售员（转介人）列表查询=>userSaleExpandList:{}", JSON.toJSONString(userSaleExpandList));
+        if (CollectionUtils.isEmpty(userSaleExpandList)) {
+            return Result.success();
+        }
+        List<ApiUserSaleExpandDetailResponse> saleExpandDetailResponseList = userSaleExpandList.stream().map(d -> {
+            ApiUserSaleExpandDetailResponse response = new ApiUserSaleExpandDetailResponse();
+            BeanUtils.copyProperties(d,response);
+            return response;
+        }).collect(Collectors.toList());
+        return Result.success(saleExpandDetailResponseList);
+    }
+
+    /**
      * 获取销售员（转介人）详情
      * @param userSaleBizId 销售员（转介人）唯一标识(业务ID)
      * @return

yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/client/usersaleexpand/ApiUserSaleExpandFeignClient.java

@@ -4,6 +4,7 @@ import com.yd.common.result.Result;
 import com.yd.insurance.base.feign.fallback.usersaleexpand.ApiUserSaleExpandFeignFallbackFactory;
 import com.yd.insurance.base.feign.request.usersaleexpand.ApiUserSaleExpandAddRequest;
 import com.yd.insurance.base.feign.request.usersaleexpand.ApiUserSaleExpandEditRequest;
+import com.yd.insurance.base.feign.request.usersaleexpand.ApiUserSaleExpandListRequest;
 import com.yd.insurance.base.feign.request.usersaleexpand.ApiUserSaleExpandPageRequest;
 import com.yd.insurance.base.feign.response.usersaleexpand.ApiUserSaleExpandDetailResponse;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -11,11 +12,12 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.util.List;
 
 /**
  * 系统用户-销售用户扩展信息Feign客户端
  */
-@FeignClient(name = "yd-user-api", path = "/user/api/userSaleExpand",fallbackFactory = ApiUserSaleExpandFeignFallbackFactory.class)
+@FeignClient(name = "yd-insurance-base-api", path = "/insurance/base/api/userSaleExpand",fallbackFactory = ApiUserSaleExpandFeignFallbackFactory.class)
 public interface ApiUserSaleExpandFeignClient {
 
     /**
@@ -27,6 +29,14 @@ public interface ApiUserSaleExpandFeignClient {
     Result page(@RequestBody ApiUserSaleExpandPageRequest request);
 
     /**
+     * 销售员（转介人）列表查询
+     * @param request
+     * @return
+     */
+    @PostMapping("/list")
+    Result<List<ApiUserSaleExpandDetailResponse>> list(@RequestBody ApiUserSaleExpandListRequest request);
+
+    /**
      * 获取销售员（转介人）详情
      * @param userSaleBizId 销售员（转介人）唯一标识(业务ID)
      * @param clientUserBizId 客户端用户表唯一业务ID

yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/fallback/usersaleexpand/ApiUserSaleExpandFeignFallbackFactory.java

@@ -4,12 +4,15 @@ import com.yd.common.result.Result;
 import com.yd.insurance.base.feign.client.usersaleexpand.ApiUserSaleExpandFeignClient;
 import com.yd.insurance.base.feign.request.usersaleexpand.ApiUserSaleExpandAddRequest;
 import com.yd.insurance.base.feign.request.usersaleexpand.ApiUserSaleExpandEditRequest;
+import com.yd.insurance.base.feign.request.usersaleexpand.ApiUserSaleExpandListRequest;
 import com.yd.insurance.base.feign.request.usersaleexpand.ApiUserSaleExpandPageRequest;
 import com.yd.insurance.base.feign.response.usersaleexpand.ApiUserSaleExpandDetailResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * 系统用户-销售用户扩展信息Feign降级处理
  */
@@ -25,6 +28,11 @@ public class ApiUserSaleExpandFeignFallbackFactory implements FallbackFactory<Ap
             }
 
             @Override
+            public Result<List<ApiUserSaleExpandDetailResponse>> list(ApiUserSaleExpandListRequest request) {
+                return null;
+            }
+
+            @Override
             public Result<ApiUserSaleExpandDetailResponse> detail(String userSaleBizId, String clientUserBizId) {
                 return null;
             }

yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/request/usersaleexpand/ApiUserSaleExpandListRequest.java

+package com.yd.insurance.base.feign.request.usersaleexpand;
+
+import lombok.Data;
+import java.util.List;
+
+@Data
+public class ApiUserSaleExpandListRequest {
+
+    private List<String> clientUserBizIdList;
+
+    /**
+     * 手机号
+     */
+    private String phone;
+}

yd-insurance-base-service/src/main/java/com/yd/insurance/base/service/dto/QueryUserSaleExpandDTO.java

+package com.yd.insurance.base.service.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class QueryUserSaleExpandDTO {
+
+    private List<String> clientUserBizIdList;
+
+    /**
+     * 手机号
+     */
+    private String phone;
+}

yd-insurance-base-service/src/main/java/com/yd/insurance/base/service/service/IUserSaleExpandService.java

@@ -5,8 +5,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yd.insurance.base.feign.request.usersaleexpand.ApiUserSaleExpandPageRequest;
 import com.yd.insurance.base.feign.response.usersaleexpand.ApiUserSaleExpandPageResponse;
+import com.yd.insurance.base.service.dto.QueryUserSaleExpandDTO;
 import com.yd.insurance.base.service.model.UserSaleExpand;
 
+import java.util.List;
+
 /**
  * <p>
  * 系统用户-销售用户扩展表 服务类
@@ -23,4 +26,6 @@ public interface IUserSaleExpandService extends IService<UserSaleExpand> {
     UserSaleExpand queryOne(String userSaleBizId);
 
     UserSaleExpand queryOne(String userSaleBizId,String clientUserBizId);
+
+    List<UserSaleExpand> queryList(QueryUserSaleExpandDTO dto);
 }

yd-insurance-base-service/src/main/java/com/yd/insurance/base/service/service/impl/UserSaleExpandServiceImpl.java

@@ -7,11 +7,15 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yd.insurance.base.feign.request.usersaleexpand.ApiUserSaleExpandPageRequest;
 import com.yd.insurance.base.feign.response.usersaleexpand.ApiUserSaleExpandPageResponse;
 import com.yd.insurance.base.service.dao.UserSaleExpandMapper;
+import com.yd.insurance.base.service.dto.QueryUserSaleExpandDTO;
 import com.yd.insurance.base.service.model.UserSaleExpand;
 import com.yd.insurance.base.service.service.IUserSaleExpandService;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 系统用户-销售用户扩展表 服务实现类
@@ -43,4 +47,12 @@ public class UserSaleExpandServiceImpl extends ServiceImpl<UserSaleExpandMapper,
         );
     }
 
+    @Override
+    public List<UserSaleExpand> queryList(QueryUserSaleExpandDTO dto) {
+        return this.lambdaQuery()
+                .eq(StringUtils.isNotBlank(dto.getPhone()),UserSaleExpand::getPhone,dto.getPhone())
+                .in(CollectionUtils.isNotEmpty(dto.getClientUserBizIdList()),UserSaleExpand::getClientUserBizId,dto.getClientUserBizIdList())
+                .list();
+    }
+
 }