Merge branch 'test_zxm_salary' into test

yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiSalaryServiceImpl.java

@@ -24,11 +24,15 @@ import com.yd.csf.feign.response.salary.ApiSalaryPageResponse;
 import com.yd.csf.feign.response.salary.ApiSalaryPushPageResponse;
 import com.yd.csf.feign.response.salary.ApiSalaryPushPageResponse;
 import com.yd.csf.service.enums.FortuneAccountStatusEnum;
 import com.yd.csf.service.enums.FortuneAccountStatusEnum;
 import com.yd.csf.service.model.FortuneAccount;
 import com.yd.csf.service.model.FortuneAccount;
+import com.yd.csf.service.model.PolicyFollow;
 import com.yd.csf.service.model.Salary;
 import com.yd.csf.service.model.Salary;
 import com.yd.csf.service.model.SalaryRemittance;
 import com.yd.csf.service.model.SalaryRemittance;
 import com.yd.csf.service.service.FortuneAccountService;
 import com.yd.csf.service.service.FortuneAccountService;
 import com.yd.csf.service.service.ISalaryRemittanceService;
 import com.yd.csf.service.service.ISalaryRemittanceService;
 import com.yd.csf.service.service.ISalaryService;
 import com.yd.csf.service.service.ISalaryService;
+import com.yd.insurance.base.feign.client.usersaleexpand.ApiUserSaleExpandFeignClient;
+import com.yd.insurance.base.feign.request.usersaleexpand.ApiUserSaleExpandListRequest;
+import com.yd.insurance.base.feign.response.usersaleexpand.ApiUserSaleExpandDetailResponse;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.ObjectUtils;
@@ -44,6 +48,7 @@ import java.time.YearMonth;
 import java.time.ZoneId;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
 @Slf4j
 @Slf4j
@@ -65,6 +70,9 @@ public class ApiSalaryServiceImpl implements ApiSalaryService {
     @Autowired
     @Autowired
     private ApiExchangeRateFeignClient apiExchangeRateFeignClient;
     private ApiExchangeRateFeignClient apiExchangeRateFeignClient;
 
 
+    @Resource
+    private ApiUserSaleExpandFeignClient apiUserSaleExpandFeignClient;
+
     /**
     /**
      * 分页查询-制作薪资单列表信息
      * 分页查询-制作薪资单列表信息
      * @param request
      * @param request
@@ -74,10 +82,46 @@ public class ApiSalaryServiceImpl implements ApiSalaryService {
     public Result<IPage<ApiSalaryPageResponse>> page(ApiSalaryPageRequest request) {
     public Result<IPage<ApiSalaryPageResponse>> page(ApiSalaryPageRequest request) {
         Page<ApiSalaryPageResponse> page = new Page<>(request.getPageNo(), request.getPageSize());
         Page<ApiSalaryPageResponse> page = new Page<>(request.getPageNo(), request.getPageSize());
         IPage<ApiSalaryPageResponse> iPage = iSalaryService.page(page, request);
         IPage<ApiSalaryPageResponse> iPage = iSalaryService.page(page, request);
+        iPage = setPage(iPage);
         return Result.success(iPage);
         return Result.success(iPage);
     }
     }
 
 
     /**
     /**
+     * 设置分页结果返参
+     * @param iPage
+     * @return
+     */
+    public IPage<ApiSalaryPageResponse> setPage(IPage<ApiSalaryPageResponse> iPage) {
+        if (CollectionUtils.isEmpty(iPage.getRecords())) {
+            return iPage;
+        }
+        List<String> clientUserBizIdList = iPage.getRecords()
+                .stream()
+                .map(ApiSalaryPageResponse::getBrokerBizId)
+                .distinct()
+                .collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(clientUserBizIdList)) {
+            return iPage;
+        }
+        ApiUserSaleExpandListRequest request = new ApiUserSaleExpandListRequest();
+        request.setClientUserBizIdList(clientUserBizIdList);
+        Result<List<ApiUserSaleExpandDetailResponse>> result = apiUserSaleExpandFeignClient.list(request);
+        if (CollectionUtils.isEmpty(request.getClientUserBizIdList())) {
+            return iPage;
+        }
+        Map<String, ApiUserSaleExpandDetailResponse> policyFollowMap = result.getData().stream()
+                .collect(Collectors.toMap(ApiUserSaleExpandDetailResponse::getClientUserBizId, Function.identity()));
+        iPage.getRecords().forEach(d -> {
+            ApiUserSaleExpandDetailResponse response = policyFollowMap.get(d.getBrokerBizId());
+            if (response != null) {
+                d.setTeamName(response.getTeamName());
+                d.setInternalNumber(response.getInternalNumber());
+            }
+        });
+        return iPage;
+    }
+
+    /**
      * 分页查询-电子薪资单列表信息（推送列表信息）
      * 分页查询-电子薪资单列表信息（推送列表信息）
      * @param request
      * @param request
      * @return
      * @return

yd-csf-feign/src/main/java/com/yd/csf/feign/response/salary/ApiSalaryPageResponse.java

@@ -18,6 +18,11 @@ public class ApiSalaryPageResponse {
     private String salaryBizId;
     private String salaryBizId;
 
 
     /**
     /**
+     * 转介人业务id
+     */
+    private String brokerBizId;
+
+    /**
      * 转介人名称
      * 转介人名称
      */
      */
     private String brokerName;
     private String brokerName;

yd-csf-service/src/main/resources/mappers/SalaryMapper.xml

@@ -6,6 +6,7 @@
         SELECT
         SELECT
         s.salary_no,
         s.salary_no,
         s.salary_biz_id,
         s.salary_biz_id,
+        s.broker_biz_id,
         s.broker_name,
         s.broker_name,
         s.internal_number,
         s.internal_number,
         s.paid_amount,
         s.paid_amount,
@@ -16,6 +17,7 @@
         GROUP_CONCAT(DISTINCT sr.currency ORDER BY sr.currency SEPARATOR ';') AS currencyList
         GROUP_CONCAT(DISTINCT sr.currency ORDER BY sr.currency SEPARATOR ';') AS currencyList
         FROM salary s
         FROM salary s
         LEFT JOIN salary_remittance sr ON s.salary_biz_id = sr.salary_biz_id AND sr.is_deleted = 0
         LEFT JOIN salary_remittance sr ON s.salary_biz_id = sr.salary_biz_id AND sr.is_deleted = 0
+
         <where>
         <where>
             <if test="request.brokerName != null and request.brokerName != ''">
             <if test="request.brokerName != null and request.brokerName != ''">
                 AND s.broker_name LIKE CONCAT('%', #{request.brokerName}, '%')
                 AND s.broker_name LIKE CONCAT('%', #{request.brokerName}, '%')