新单跟进同步预约信息test

yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiCustomerController.java

@@ -2,10 +2,7 @@ package com.yd.csf.api.controller;
 
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yd.base.feign.client.relobjectcertificate.ApiRelObjectCertificateFeignClient;
 import com.yd.base.feign.dto.ApiCertificateDto;
-import com.yd.base.feign.request.relobjectcertificate.ApiRelObjectCertificateListRequest;
-import com.yd.base.feign.response.relobjectcertificate.ApiRelObjectCertificateListResponse;
 import com.yd.common.enums.CommonEnum;
 import com.yd.common.enums.ResultCode;
 import com.yd.common.exception.BusinessException;
@@ -17,8 +14,11 @@ import com.yd.csf.service.common.ErrorCode;
 import com.yd.csf.service.dto.CustomerAddRequest;
 import com.yd.csf.service.dto.CustomerQueryRequest;
 import com.yd.csf.service.dto.CustomerUpdateRequest;
+import com.yd.csf.service.dto.TaxationDto;
 import com.yd.csf.service.model.Customer;
+import com.yd.csf.service.model.Taxation;
 import com.yd.csf.service.service.CustomerService;
+import com.yd.csf.service.service.ITaxationService;
 import com.yd.csf.service.utils.GSONUtil;
 import com.yd.csf.service.vo.CustomerVO;
 
@@ -26,7 +26,6 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
@@ -54,7 +53,7 @@ public class ApiCustomerController {
     @Resource
     private ApiTaxationService apiTaxationService;
     @Resource
-    private ApiRelObjectCertificateFeignClient apiRelObjectCertificateFeignClient;
+    private ITaxationService iTaxationService;
 
     /**
      * 创建客户
@@ -189,11 +188,11 @@ public class ApiCustomerController {
 
         if (!CollUtil.isEmpty(customerList)) {
             for (Customer customer : customerList) {
-                List<ApiCertificateDto> apiCertificateDtoList = apiCertificateDtoList(customer.getCustomerBizId());
-                if (CollUtil.isNotEmpty(apiCertificateDtoList)) {
-                    customer.setCertificateList(GSONUtil.toJson(apiCertificateDtoList));
+                List<ApiTaxationDto> apiTaxationDtoList = apiTaxationDtoList(customer.getCustomerBizId());
+                if (CollUtil.isNotEmpty(apiTaxationDtoList)) {
+                    customer.setTaxList(GSONUtil.toJson(apiTaxationDtoList));
                     customerService.lambdaUpdate()
-                            .set(Customer::getCertificateList, customer.getCertificateList())
+                            .set(Customer::getTaxList, customer.getTaxList())
                             .eq(Customer::getId, customer.getId())
                             .update();
                     try {
@@ -209,20 +208,22 @@ public class ApiCustomerController {
         return Result.success(true);
     }
 
-    public List<ApiCertificateDto> apiCertificateDtoList(String customerBizId) {
-        List<ApiCertificateDto> apiCertificateDtoList = new ArrayList<>();
-        //查询投保人证件列表信息
-        Result<List<ApiRelObjectCertificateListResponse>> result = apiRelObjectCertificateFeignClient.list(ApiRelObjectCertificateListRequest.builder()
-                .objectBizId(customerBizId)
-                .build());
+    public Result<List<Taxation>> list(ApiObjectTaxationDto dto) {
+        List<Taxation> list = iTaxationService.queryList(TaxationDto.builder().objectBizId(dto.getObjectBizId()).build());
+        return Result.success(list);
+    }
+
+    public List<ApiTaxationDto> apiTaxationDtoList(String objectBizId) {
+        List<ApiTaxationDto> apiTaxationDtoList = new ArrayList<>();
+        Result<List<Taxation>> result = list(ApiObjectTaxationDto.builder().objectBizId(objectBizId).build());
         if (!CollectionUtils.isEmpty(result.getData())) {
-            apiCertificateDtoList = result.getData().stream().map(dto -> {
-                ApiCertificateDto apiCertificateDto = new ApiCertificateDto();
-                BeanUtils.copyProperties(dto,apiCertificateDto);
-                return apiCertificateDto;
+            apiTaxationDtoList = result.getData().stream().map(d -> {
+                ApiTaxationDto taxationDto = new ApiTaxationDto();
+                BeanUtils.copyProperties(d,taxationDto);
+                return taxationDto;
             }).collect(Collectors.toList());
         }
-        return apiCertificateDtoList;
+        return apiTaxationDtoList;
     }
 
     /**